From 46f347ada33bd5a16cab3d796054299105b71481 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 28 Sep 2022 13:27:19 +0900 Subject: [PATCH 1/2] kernel-install: do not fail if $layout is not "bls" Fixes #24836. --- src/kernel-install/kernel-install.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index d44ed5030c..aa29f20aad 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -303,8 +303,8 @@ export KERNEL_INSTALL_LAYOUT="$layout" export KERNEL_INSTALL_INITRD_GENERATOR="$initrd_generator" export KERNEL_INSTALL_STAGING_AREA -[ "$layout" = "bls" ] -MAKE_ENTRY_DIR_ABS=$? +MAKE_ENTRY_DIR_ABS=0 +[ "$layout" = "bls" ] || MAKE_ENTRY_DIR_ABS=1 ret=0 From c561c78063c951dbf0d7a176c74d51312c3dfaf7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 28 Sep 2022 13:35:49 +0900 Subject: [PATCH 2/2] kernel-install: do not fail if a plugin exits with 77 --- src/kernel-install/kernel-install.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in index aa29f20aad..22eb4d2be1 100755 --- a/src/kernel-install/kernel-install.in +++ b/src/kernel-install/kernel-install.in @@ -349,9 +349,8 @@ case "$COMMAND" in for f in $KERNEL_INSTALL_PLUGINS; do log_verbose "+$f add $KERNEL_VERSION $ENTRY_DIR_ABS" "$@" - "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@" - - err=$? + err=0 + "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$@" || err=$? [ $err -eq $skip_remaining ] && break [ $err -ne 0 ] && exit $err done @@ -360,8 +359,8 @@ case "$COMMAND" in remove) for f in $KERNEL_INSTALL_PLUGINS; do log_verbose "+$f remove $KERNEL_VERSION $ENTRY_DIR_ABS" - "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS" - err=$? + err=0 + "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS" || err=$? [ $err -eq $skip_remaining ] && break [ $err -ne 0 ] && exit $err done