diff options
| author | наб <nabijaczleweli@nabijaczleweli.xyz> | 2022-05-26 23:16:13 +0200 |
|---|---|---|
| committer | наб <nabijaczleweli@nabijaczleweli.xyz> | 2022-05-26 23:16:13 +0200 |
| commit | c60ca42571dec74bdfaf73ceae854cadd247532b (patch) | |
| tree | 75e9be9a24c7e489112c508e2001d6c8f7752779 /src/kernel-install | |
| parent | e5985a7d07295bb60a5821b78d3d21d2f34530ab (diff) | |
| download | systemd-c60ca42571dec74bdfaf73ceae854cadd247532b.tar.gz | |
kernel-install: actually ignore the last two arguments
Diffstat (limited to 'src/kernel-install')
| -rwxr-xr-x | src/kernel-install/kernel-install.in | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index 5f88ac2490..96c50ba633 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -80,12 +80,13 @@ fi if [ "${0##*/}" = "installkernel" ]; then COMMAND=add - # make install doesn't pass any initrds - no_initrds=1 + # kernel's install.sh invokes us as + # /sbin/installkernel <version> <vmlinuz> <map> <installation-dir> + # We ignore the last two arguments. + set -- "$1" else COMMAND="$1" [ $# -ge 1 ] && shift - no_initrds=0 fi if [ "$COMMAND" = "inspect" ]; then @@ -323,16 +324,8 @@ case "$COMMAND" in fi for f in $PLUGINS; do - if [ "$no_initrds" = 1 ]; then - # kernel's install.sh invokes us as - # /sbin/installkernel <version> <vmlinuz> <map> <installation-dir> - # We ignore the last two arguments. - [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "+$f add $KERNEL_VERSION $ENTRY_DIR_ABS $1" - "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$1" - else - [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "+$f add $KERNEL_VERSION $ENTRY_DIR_ABS $*" - "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@" - fi + [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "+$f add $KERNEL_VERSION $ENTRY_DIR_ABS $*" + "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@" err=$? [ $err -eq $skip_remaining ] && break |