Skip to contentSkip to conversation

util/grub.d/linux: Improve initramfs detection

PATCH In review Oskari Pirhonen 2 participants 2 messages May 3, 2022 – May 17, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 util/grub.d/linux: Improve initramfs detection

Add detection for initramfs of the form *.img.old. For example, Gentoo's sys-kernel/genkernel installs it as initramfs-*.img and moves any existing one to initramfs-*.img.old.

Apply the same scheme to initrd-*.img and initrd-*.gz files for consistency.

---
v2 -> v3:
- include initrd-* files in the commit message
- fix indentation to follow existing
- leave initramfs-genkernel-* on their own line

v1 -> v2:
- don't reorder the checks
- include 20_linux_xen.in

 util/grub.d/10_linux.in     | 6 ++++--
 util/grub.d/20_linux_xen.in | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)
util/grub.d/10_linux.in +4 -2
index ca068038e..b4a4d6900 100644
@@ -215,8 +215,10 @@ while [ "x$list" != "x" ] ; do
   done
 
   initrd_real=
-  for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
-	   "initrd-${version}" "initramfs-${version}.img" \
+  for i in "initrd.img-${version}" "initrd-${version}.img" \
+	   "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+	   "initrd-${alt_version}.gz.old" "initrd-${version}" \
+	   "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
 	   "initramfs-genkernel-${version}" \
util/grub.d/20_linux_xen.in +4 -2
index f45559ff8..51a983926 100644
@@ -284,8 +284,10 @@ while [ "x${xen_list}" != "x" ] ; do
 	linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
 
 	initrd_real=
-	for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
-	   "initrd-${version}" "initramfs-${version}.img" \
+	for i in "initrd.img-${version}" "initrd-${version}.img" \
+	   "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+	   "initrd-${alt_version}.gz.old" "initrd-${version}" \
+	   "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
 	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
 	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
 	   "initramfs-genkernel-${version}" \
Signature · 1 line
2.35.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 8 lines · Oskari Pirhonen

Add detection for initramfs of the form *.img.old. For example, Gentoo's sys-kernel/genkernel installs it as initramfs-*.img and moves any existing one to initramfs-*.img.old.

Apply the same scheme to initrd-*.img and initrd-*.gz files for consistency.

Daniel