903e8e0f88
This makes sure that 90-loaderentry.install plays nicely with the dracut kernel-install plugin that is shipped in Fedora and CentOS Stream.
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
From 1310492f7a58db4315390db174da65aef699aa91 Mon Sep 17 00:00:00 2001
|
|
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
|
Date: Mon, 29 Jul 2024 15:41:51 +0200
|
|
Subject: [PATCH] kernel-install: Try some more initrd variants in
|
|
90-loaderentry.install
|
|
|
|
On CentOS/Fedora, dracut is configured to write the initrd to
|
|
/boot/initramfs-$KERNEL_VERSION...img so let's check for that as well
|
|
if no initrds were supplied.
|
|
---
|
|
src/kernel-install/90-loaderentry.install.in | 14 ++++++++++++--
|
|
1 file changed, 12 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/kernel-install/90-loaderentry.install.in b/src/kernel-install/90-loaderentry.install.in
|
|
index 4ef6aca169c1a..84f7a4a97fb43 100755
|
|
--- a/src/kernel-install/90-loaderentry.install.in
|
|
+++ b/src/kernel-install/90-loaderentry.install.in
|
|
@@ -205,8 +205,18 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
|
|
have_initrd=yes
|
|
done
|
|
|
|
- # Try "initrd", generated by dracut in its kernel-install hook, if no initrds were supplied
|
|
- [ -z "$have_initrd" ] && [ -f "$ENTRY_DIR_ABS/initrd" ] && echo "initrd $ENTRY_DIR/initrd"
|
|
+ # Try a few variations that are generated by various initrd generators in their kernel-install hooks if
|
|
+ # no initrds were supplied.
|
|
+
|
|
+ if [ -z "$have_initrd" ] && [ -f "$ENTRY_DIR_ABS/initrd" ]; then
|
|
+ echo "initrd $ENTRY_DIR/initrd"
|
|
+ have_initrd=yes
|
|
+ fi
|
|
+
|
|
+ if [ -z "$have_initrd" ] && [ -f "$BOOT_ROOT/initramfs-$KERNEL_VERSION.img" ]; then
|
|
+ echo "initrd /initramfs-$KERNEL_VERSION.img"
|
|
+ have_initrd=yes
|
|
+ fi
|
|
:
|
|
} >"$LOADER_ENTRY" || {
|
|
echo "Error: could not create loader entry '$LOADER_ENTRY'." >&2
|