Skip to contentSkip to conversation

util/grub.d/linux: Improve initramfs detection

PATCH Superseded Oskari Pirhonen 2 participants 4 messages Mar 28, 2022 – Apr 27, 2022

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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.

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

 util/grub.d/10_linux.in     | 17 +++++++++--------
 util/grub.d/20_linux_xen.in | 29 +++++++++++++++--------------
 2 files changed, 24 insertions(+), 22 deletions(-)
util/grub.d/10_linux.in +9 -8
index ca068038e..cb049e943 100644
@@ -215,14 +215,15 @@ 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
+  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}" "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
util/grub.d/20_linux_xen.in +15 -14
index f45559ff8..5a1b7b7d4 100644
@@ -283,20 +283,21 @@ while [ "x${xen_list}" != "x" ] ; do
 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
 	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" \
-	   "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
+    initrd_real=
+    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}" "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
 
 	initrd=
 	if test -n "${initrd_early}" || test -n "${initrd_real}"; then
Signature · 1 line
2.34.1
#1 lore raw
Quoted 3 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.

You are mentioning initramfs* files but the patch adds also initrd* files. Could you explain that in the commit message?

Quoted 1 line

You are breaking indention in the patch.

Quoted 23 lines

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

 util/grub.d/10_linux.in     | 17 +++++++++--------
 util/grub.d/20_linux_xen.in | 29 +++++++++++++++--------------
 2 files changed, 24 insertions(+), 22 deletions(-)
util/grub.d/10_linux.in +0 -6
index ca068038e..cb049e943 100644
@@ -215,14 +215,15 @@ 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}" \

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

Quoted 10 lines
util/grub.d/10_linux.in +8 -2
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+  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}" "initramfs-genkernel-${alt_version}" \
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \

Here...

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

Quoted 1 line
util/grub.d/10_linux.in +1 -0
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do

Ditto...

Quoted 16 lines
util/grub.d/10_linux.in +0 -0
     if test -e "${dirname}/${i}" ; then
       initrd_real="${i}"
       break
util/grub.d/20_linux_xen.in +0 -5
index f45559ff8..5a1b7b7d4 100644
@@ -283,20 +283,21 @@ while [ "x${xen_list}" != "x" ] ; do
 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
 	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" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 286

Quoted 10 lines
util/grub.d/20_linux_xen.in +1 -9
-	   "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
+    initrd_real=

And here...

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 293

Quoted 7 lines
util/grub.d/20_linux_xen.in +7 -0
+    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}" "initramfs-genkernel-${alt_version}" \

I would leave these two file names in separate lines. Same above...

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 300

Quoted 7 lines
util/grub.d/20_linux_xen.in +7 -0
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+        if test -e "${dirname}/${i}" ; then
+            initrd_real="${i}"
+            break
+        fi
+    done

Again, broken indention... It is almost in every line of this patch.

Daniel

#2 lore raw
Quoted 7 lines · Daniel Kiper
Quoted 3 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.

You are mentioning initramfs* files but the patch adds also initrd* files. Could you explain that in the commit message?

Yeah, I can do that.

Quoted 82 lines
Quoted 2 lines

You are breaking indention in the patch.

Quoted 23 lines

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

 util/grub.d/10_linux.in     | 17 +++++++++--------
 util/grub.d/20_linux_xen.in | 29 +++++++++++++++--------------
 2 files changed, 24 insertions(+), 22 deletions(-)
util/grub.d/10_linux.in +0 -6
index ca068038e..cb049e943 100644
@@ -215,14 +215,15 @@ 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}" \

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

Quoted 10 lines
util/grub.d/10_linux.in +8 -2
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+  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}" "initramfs-genkernel-${alt_version}" \
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \

Here...

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

Quoted 1 line
util/grub.d/10_linux.in +1 -0
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do

Ditto...

Quoted 16 lines
util/grub.d/10_linux.in +0 -0
     if test -e "${dirname}/${i}" ; then
       initrd_real="${i}"
       break
util/grub.d/20_linux_xen.in +0 -5
index f45559ff8..5a1b7b7d4 100644
@@ -283,20 +283,21 @@ while [ "x${xen_list}" != "x" ] ; do
 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
 	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" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 286

Quoted 10 lines
util/grub.d/20_linux_xen.in +1 -9
-	   "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
+    initrd_real=

And here...

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 293

Quoted 7 lines
util/grub.d/20_linux_xen.in +7 -0
+    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}" "initramfs-genkernel-${alt_version}" \
Quoted 1 line

I would leave these two file names in separate lines. Same above...

OK.

Quoted 10 lines

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 300

Quoted 8 lines
util/grub.d/20_linux_xen.in +7 -0
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+        if test -e "${dirname}/${i}" ; then
+            initrd_real="${i}"
+            break
+        fi
+    done

Again, broken indention... It is almost in every line of this patch.

That is actually something I wanted to address in a separate thread. The indentation/style feels kind of all over the place in the few files in grub.d/ that I glanced at. Some lines are indented with spaces, others with tabs. Sometimes variables are substituted with $var, other times with ${var}. Sometimes if [ ... ] is used, other times if test ... is.

If there isn't already an existing style guide that I can reference, I would like to establish one and then re-style these scripts to be consistent with that. But it'd have to be a separate endeavor in that case.

In the meantime, how would you like me to indent the lines in this patch?

- Oskari

Quoted 7 lines

Daniel

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel

#3 lore raw

Sorry, somehow I missed your reply...

Quoted 10 lines · Oskari Pirhonen
Quoted 7 lines · Daniel Kiper
Quoted 3 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.

You are mentioning initramfs* files but the patch adds also initrd* files. Could you explain that in the commit message?

Yeah, I can do that.

Cool! Thanks!

Quoted 94 lines
Quoted 81 lines
Quoted 1 line

You are breaking indention in the patch.

Quoted 23 lines

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

 util/grub.d/10_linux.in     | 17 +++++++++--------
 util/grub.d/20_linux_xen.in | 29 +++++++++++++++--------------
 2 files changed, 24 insertions(+), 22 deletions(-)
util/grub.d/10_linux.in +0 -6
index ca068038e..cb049e943 100644
@@ -215,14 +215,15 @@ 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}" \

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

Quoted 10 lines
util/grub.d/10_linux.in +8 -2
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+  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}" "initramfs-genkernel-${alt_version}" \
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \

Here...

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

Quoted 1 line
util/grub.d/10_linux.in +1 -0
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do

Ditto...

Quoted 16 lines
util/grub.d/10_linux.in +0 -0
     if test -e "${dirname}/${i}" ; then
       initrd_real="${i}"
       break
util/grub.d/20_linux_xen.in +0 -5
index f45559ff8..5a1b7b7d4 100644
@@ -283,20 +283,21 @@ while [ "x${xen_list}" != "x" ] ; do
 	alt_version=`echo $version | sed -e "s,\.old$,,g"`
 	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" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 286

Quoted 10 lines
util/grub.d/20_linux_xen.in +1 -9
-	   "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
+    initrd_real=

And here...

util/grub.d/20_linux_xen.in while [ "x${xen_list}" != "x" ] ; do · line 293

Quoted 7 lines
util/grub.d/20_linux_xen.in +7 -0
+    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}" "initramfs-genkernel-${alt_version}" \
Quoted 1 line

I would leave these two file names in separate lines. Same above...

OK.

Quoted 9 lines
Quoted 8 lines
util/grub.d/20_linux_xen.in +7 -0
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
+        "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
+        if test -e "${dirname}/${i}" ; then
+            initrd_real="${i}"
+            break
+        fi
+    done
Quoted 7 lines
Quoted 1 line

Again, broken indention... It is almost in every line of this patch.

That is actually something I wanted to address in a separate thread. The indentation/style feels kind of all over the place in the few files in grub.d/ that I glanced at. Some lines are indented with spaces, others with tabs. Sometimes variables are substituted with $var, other times with ${var}. Sometimes if [ ... ] is used, other times if test ... is.

Try to keep with a style in a given file in util/grub.d.

Quoted 4 lines

If there isn't already an existing style guide that I can reference, I would like to establish one and then re-style these scripts to be consistent with that. But it'd have to be a separate endeavor in that case.

Yeah, I think it would be nice to fix that mess at some point.

Quoted 2 lines

In the meantime, how would you like me to indent the lines in this patch?

If you need more than 7 spaces then use tabs first and spaces after that as needed.

Daniel