From b31c492f473dee2f45c5c6552ef75525768f799a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Jul 29 2024 16:58:47 +0000 Subject: Merge remote-tracking branch 'fedora-fork/kernel-install' into c10s-sig-hyperscale --- diff --git a/33861.patch b/33861.patch index ab777fa..b443387 100644 --- a/33861.patch +++ b/33861.patch @@ -1,4 +1,4 @@ -From 987e1808034baac4fc2395c1c1f9cc0a510e0987 Mon Sep 17 00:00:00 2001 +From 1310492f7a58db4315390db174da65aef699aa91 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 29 Jul 2024 15:41:51 +0200 Subject: [PATCH] kernel-install: Try some more initrd variants in @@ -12,7 +12,7 @@ if no initrds were supplied. 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..1470f6f78a97c 100755 +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%/*}" || { @@ -30,7 +30,7 @@ index 4ef6aca169c1a..1470f6f78a97c 100755 + fi + + if [ -z "$have_initrd" ] && [ -f "$BOOT_ROOT/initramfs-$KERNEL_VERSION.img" ]; then -+ echo "initrd /${initrd##*/}" ++ echo "initrd /initramfs-$KERNEL_VERSION.img" + have_initrd=yes + fi :