Skip to contentSkip to conversation

util/grub.d/10_linux: Improve initramfs detection

PATCH Superseded Oskari Pirhonen 2 participants 3 messages Mar 17, 2022 – Mar 27, 2022

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util/grub.d/10_linux: Improve initramfs detection

Prefer using a *.old initramfs for *.old kernels if it exists. Otherwise look for an initramfs without the suffix.

Also 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.

---
 util/grub.d/10_linux.in | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)
util/grub.d/10_linux.in +28 -13
index ca068038e..4a666c317 100644
@@ -215,19 +215,34 @@ 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" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-	   "initramfs-genkernel-${version}" \
-	   "initramfs-genkernel-${alt_version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-    if test -e "${dirname}/${i}" ; then
-      initrd_real="${i}"
-      break
-    fi
-  done
+  # Prefer to match *.old kernel with *.old initramfs if it exists
+  if [ "${alt_version}" != "${version}" ]; then
+    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" \
+          "initramfs-genkernel-${version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${version}"; do
+      if test -e "${dirname}/${i}" ; then
+        initrd_real="${i}"
+        break
+      fi
+    done
+  fi
+
+  # alt_version == version or *.old initramfs not found
+  # use alt_version to handle both cases at once
+  if [ -z "${initrd_real}" ]; then
+    for i in "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+          "initrd-${alt_version}.gz" "initrd-${alt_version}" \
+          "initramfs-${alt_version}.img" "initramfs-genkernel-${alt_version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+      if test -e "${dirname}/${i}" ; then
+        initrd_real="${i}"
+        break
+      fi
+    done
+  fi
 
   initrd=
   if test -n "${initrd_early}" || test -n "${initrd_real}"; then
Signature · 1 line
2.34.1
#1 lore raw
Quoted 10 lines · Oskari Pirhonen

Prefer using a *.old initramfs for *.old kernels if it exists. Otherwise look for an initramfs without the suffix.

Also 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.

---
 util/grub.d/10_linux.in | 41 ++++++++++++++++++++++++++++-------------

You should update the util/grub.d/20_linux_xen.in too.

Quoted 18 lines
 1 file changed, 28 insertions(+), 13 deletions(-)
util/grub.d/10_linux.in +0 -8
index ca068038e..4a666c317 100644
@@ -215,19 +215,34 @@ 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" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-	   "initramfs-genkernel-${version}" \
-	   "initramfs-genkernel-${alt_version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do

util/grub.d/10_linux.in while [ "x$list" != "x" ] ; do · line 222

Quoted 10 lines
util/grub.d/10_linux.in +5 -5
-    if test -e "${dirname}/${i}" ; then
-      initrd_real="${i}"
-      break
-    fi
-  done
+  # Prefer to match *.old kernel with *.old initramfs if it exists
+  if [ "${alt_version}" != "${version}" ]; then
+    for i in "initrd.img-${version}" "initrd-${version}.img" \
+          "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+          "initrd-${alt_version}.gz.old" "initrd-${version}" \

Why do you change order of images in comparison to the original above? I think it should be more or less *${version} *${alt_version}.img.old *${alt_version}.gz.old *${alt_version} and so on...

Quoted 13 lines
util/grub.d/10_linux.in +13 -0
+          "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
+          "initramfs-genkernel-${version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${version}"; do
+      if test -e "${dirname}/${i}" ; then
+        initrd_real="${i}"
+        break
+      fi
+    done
+  fi
+
+  # alt_version == version or *.old initramfs not found
+  # use alt_version to handle both cases at once
+  if [ -z "${initrd_real}" ]; then

util/grub.d/10_linux.in while [ "x$list" != "x" ] ; do · line 245

Quoted 10 lines
util/grub.d/10_linux.in +10 -0
+    for i in "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+          "initrd-${alt_version}.gz" "initrd-${alt_version}" \
+          "initramfs-${alt_version}.img" "initramfs-genkernel-${alt_version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+      if test -e "${dirname}/${i}" ; then
+        initrd_real="${i}"
+        break
+      fi
+    done
+  fi

Daniel

#2 lore raw
Quoted 8 lines · Daniel Kiper
Quoted 7 lines · Oskari Pirhonen

Prefer using a *.old initramfs for *.old kernels if it exists. Otherwise look for an initramfs without the suffix.

Also 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.

Quoted 5 lines
Quoted 3 lines
---
 util/grub.d/10_linux.in | 41 ++++++++++++++++++++++++++++-------------

You should update the util/grub.d/20_linux_xen.in too.

Good point.

Quoted 25 lines
Quoted 25 lines
 1 file changed, 28 insertions(+), 13 deletions(-)
util/grub.d/10_linux.in +1 -13
index ca068038e..4a666c317 100644
@@ -215,19 +215,34 @@ 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" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-	   "initramfs-genkernel-${version}" \
-	   "initramfs-genkernel-${alt_version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-    if test -e "${dirname}/${i}" ; then
-      initrd_real="${i}"
-      break
-    fi
-  done
+  # Prefer to match *.old kernel with *.old initramfs if it exists
Quoted 8 lines

util/grub.d/10_linux.in while [ "x$list" != "x" ] ; do · line 222

Quoted 4 lines
util/grub.d/10_linux.in +4 -0
+  if [ "${alt_version}" != "${version}" ]; then
+    for i in "initrd.img-${version}" "initrd-${version}.img" \
+          "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
+          "initrd-${alt_version}.gz.old" "initrd-${version}" \

Why do you change order of images in comparison to the original above? I think it should be more or less *${version} *${alt_version}.img.old *${alt_version}.gz.old *${alt_version} and so on...

I reordered it slightly, but tried to keep it the same in spirit. I can rework this though and submit a v2 including 20_linux_xen in it too.

Quoted 25 lines
Quoted 14 lines
util/grub.d/10_linux.in +13 -0
+          "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
+          "initramfs-genkernel-${version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${version}"; do
+      if test -e "${dirname}/${i}" ; then
+        initrd_real="${i}"
+        break
+      fi
+    done
+  fi
+
+  # alt_version == version or *.old initramfs not found
+  # use alt_version to handle both cases at once
+  if [ -z "${initrd_real}" ]; then

util/grub.d/10_linux.in while [ "x$list" != "x" ] ; do · line 245

Quoted 10 lines
util/grub.d/10_linux.in +10 -0
+    for i in "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
+          "initrd-${alt_version}.gz" "initrd-${alt_version}" \
+          "initramfs-${alt_version}.img" "initramfs-genkernel-${alt_version}" \
+          "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+      if test -e "${dirname}/${i}" ; then
+        initrd_real="${i}"
+        break
+      fi
+    done
+  fi
Quoted 1 line

Daniel

- Oskari