Merge pull request #19713 from nabijaczleweli/bootctlpsko-liter

The "obviously good stuff" from #19006 again
kernel-install: don't erase previous errors if a hook returns 77
2026-03-16 18:14:46 +01:00 · 2021-05-25 08:31:38 +09:00 · 2021-05-24 21:56:35 +02:00 · 2021-05-24 21:35:12 +02:00
2 changed files with 8 additions and 14 deletions
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@ -92,12 +92,10 @@ else
    LOADER_ENTRY="$BOOT_ROOT/loader/entries/$MACHINE_ID-$KERNEL_VERSION.conf"
 fi

-cp "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" &&
-    chown root:root "$ENTRY_DIR_ABS/linux" &&
-    chmod 0644 "$ENTRY_DIR_ABS/linux" || {
-        echo "Could not copy '$KERNEL_IMAGE to '$ENTRY_DIR_ABS/linux'." >&2
+install -g root -o root -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || {
+    echo "Could not copy '$KERNEL_IMAGE' to '$ENTRY_DIR_ABS/linux'." >&2
    exit 1
-    }
+}

 INITRD_OPTIONS=( "${@:${INITRD_OPTIONS_START}}" )

@ -106,9 +104,7 @@ for initrd in "${INITRD_OPTIONS[@]}"; do
        initrd_basename="$(basename ${initrd})"
        [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
            echo "Installing $ENTRY_DIR_ABS/${initrd_basename}"
-        cp "${initrd}" "$ENTRY_DIR_ABS/${initrd_basename}" &&
-            chown root:root "$ENTRY_DIR_ABS/${initrd_basename}" &&
-            chmod 0644 "$ENTRY_DIR_ABS/${initrd_basename}" || {
+        install -g root -o root -m 0644 "${initrd}" "$ENTRY_DIR_ABS/${initrd_basename}" || {
            echo "Could not copy '${initrd}' to '$ENTRY_DIR_ABS/${initrd_basename}'." >&2
            exit 1
        }
--- a/src/kernel-install/kernel-install
+++ b/src/kernel-install/kernel-install
@ -142,7 +142,6 @@ case $COMMAND in
                "$f" add "$KERNEL_VERSION" "$ENTRY_DIR_ABS" "$KERNEL_IMAGE" "${INITRD_OPTIONS[@]}"
                x=$?
                if [[ $x == $SKIP_REMAINING ]]; then
-                    ret=0
                    break
                fi
                ((ret+=$x))
@ -158,7 +157,6 @@ case $COMMAND in
                "$f" remove "$KERNEL_VERSION" "$ENTRY_DIR_ABS"
                x=$?
                if [[ $x == $SKIP_REMAINING ]]; then
-                    ret=0
                    break
                fi
                ((ret+=$x))
Author	SHA1	Message	Date
Yu Watanabe	5709c7fe4e	Merge pull request #19713 from nabijaczleweli/bootctlpsko-liter The "obviously good stuff" from #19006 again	2021-05-25 08:31:38 +09:00
наб	44230fa2b0	kernel-install: don't erase previous errors if a hook returns 77 The manpage says that exiting 77 is the same as exiting 0, then skipping all other hooks, but the behaviour heretofor was to exit 0, skip all, and behave as if all hooks exited 0	2021-05-24 21:56:35 +02:00
наб	0ad401dc5d	kernel-install/90-loaderentry: use install(1) instead of cp/chown/chmod chains Also fix typo in error message	2021-05-24 21:35:12 +02:00