kernel-install: 90-loaderentry: error out on nonexistent initrds instead of swallowing them quietly
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user