From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 26 May 2022 18:56:12 +0000 (+0200)
Subject: kernel-install: if a plugin fails, return error immediately
X-Git-Tag: v252-rc1~921^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5aa285b437d14c809649beaa2b47341b0de4a67d;p=thirdparty%2Fsystemd.git

kernel-install: if a plugin fails, return error immediately

Since the first version in 81516adcb71a47837544340f72eb8ee810274119,
kernel-install would "gather" a return value by summing the exit codes
of the plugins… This makes no sense, because those are not additive values.

Let's just break off immediately. We now implement cleanup via trap, so if we
break, we should leave no garbage behind.
---

diff --git a/src/kernel-install/kernel-install.in b/src/kernel-install/kernel-install.in
index 5f88ac2490e..9296bfcd8e8 100755
--- a/src/kernel-install/kernel-install.in
+++ b/src/kernel-install/kernel-install.in
@@ -336,7 +336,7 @@ case "$COMMAND" in
 
             err=$?
             [ $err -eq $skip_remaining ] && break
-            ret=$(( ret + err ))
+            [ $err -ne 0 ] && exit $err
         done
         ;;
 
@@ -346,7 +346,7 @@ case "$COMMAND" in
             "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS"
             err=$?
             [ $err -eq $skip_remaining ] && break
-            ret=$(( ret + err ))
+            [ $err -ne 0 ] && exit $err
         done
 
         if [ "$MAKE_ENTRY_DIR_ABS" -eq 0 ]; then