Merge pull request #19713 from nabijaczleweli/bootctlpsko-liter

The "obviously good stuff" from #19006 again

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" &&
+install -g root -o root -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || {
-    chown root:root "$ENTRY_DIR_ABS/linux" &&
+    echo "Could not copy '$KERNEL_IMAGE' to '$ENTRY_DIR_ABS/linux'." >&2
-    chmod 0644 "$ENTRY_DIR_ABS/linux" || {
+    exit 1
-        echo "Could not copy '$KERNEL_IMAGE to '$ENTRY_DIR_ABS/linux'." >&2
+}
-        exit 1
-    }
 
 INITRD_OPTIONS=( "${@:${INITRD_OPTIONS_START}}" )
 
@@ -106,12 +104,10 @@ 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}" &&
+        install -g root -o root -m 0644 "${initrd}" "$ENTRY_DIR_ABS/${initrd_basename}" || {
-            chown root:root "$ENTRY_DIR_ABS/${initrd_basename}" &&
+            echo "Could not copy '${initrd}' to '$ENTRY_DIR_ABS/${initrd_basename}'." >&2
-            chmod 0644 "$ENTRY_DIR_ABS/${initrd_basename}" || {
+            exit 1
-                echo "Could not copy '${initrd}' to '$ENTRY_DIR_ABS/${initrd_basename}'." >&2
+        }
-                exit 1
-            }
     fi
 done
 

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))