From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 28 Sep 2022 04:35:49 +0000 (+0900)
Subject: kernel-install: do not fail if a plugin exits with 77
X-Git-Tag: v252-rc1~76^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F24837%2Fhead;p=thirdparty%2Fsystemd.git

kernel-install: do not fail if a plugin exits with 77
---

diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index aa29f20aad8..22eb4d2be14 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