diff options
author | наб <nabijaczleweli@nabijaczleweli.xyz> | 2021-12-17 19:51:12 +0100 |
---|---|---|
committer | наб <nabijaczleweli@nabijaczleweli.xyz> | 2022-01-04 15:39:09 +0100 |
commit | 742561efbe938c45936f2e4f5d81b3ff6b352882 (patch) | |
tree | 1d920af253a961288d6990d1a47b9e0dd63f26c0 /src/kernel-install/90-loaderentry.install | |
parent | 76b1274a5cb54acaa4a0f0c2e570d751f9067c06 (diff) | |
download | systemd-742561efbe938c45936f2e4f5d81b3ff6b352882.tar.gz |
kernel-install: 90-loaderentry: error out on nonexistent initrds instead of swallowing them quietly
Diffstat (limited to 'src/kernel-install/90-loaderentry.install')
-rw-r--r-- | src/kernel-install/90-loaderentry.install | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install index 35324e69a9..e588e72bf9 100644 --- a/src/kernel-install/90-loaderentry.install +++ b/src/kernel-install/90-loaderentry.install @@ -93,7 +93,10 @@ install -g root -o root -m 0644 "$KERNEL_IMAGE" "$ENTRY_DIR_ABS/linux" || { shift "$INITRD_OPTIONS_SHIFT" for initrd; do - [ -f "$initrd" ] || continue + [ -f "$initrd" ] || { + echo "Initrd '$initrd' not a file." >&2 + exit 1 + } initrd_basename="${initrd##*/}" [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Installing $ENTRY_DIR_ABS/$initrd_basename" @@ -108,9 +111,6 @@ mkdir -p "${LOADER_ENTRY%/*}" || { exit 1 } -# Try "initrd", generated by dracut in its kernel-install hook, if no initrds were supplied -[ $# -eq 0 ] && set -- "initrd" - [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Creating $LOADER_ENTRY" { echo "title $PRETTY_NAME" @@ -119,8 +119,10 @@ mkdir -p "${LOADER_ENTRY%/*}" || { echo "options $BOOT_OPTIONS" echo "linux $ENTRY_DIR/linux" for initrd; do - [ -f "$ENTRY_DIR_ABS/${initrd##*/}" ] && echo "initrd $ENTRY_DIR/${initrd##*/}" + echo "initrd $ENTRY_DIR/${initrd##*/}" done + # Try "initrd", generated by dracut in its kernel-install hook, if no initrds were supplied + [ $# -eq 0 ] && [ -f "$ENTRY_DIR_ABS/initrd" ] && echo "initrd $ENTRY_DIR/initrd" : } >"$LOADER_ENTRY" || { echo "Could not create loader entry '$LOADER_ENTRY'." >&2 |