[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d37aca7cfd4c62d04b4033e5a0a3a8bad9ce510e

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. d37aca7cfd4c62d04b4033e5a0a3a8bad9ce510e

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, master has been updated
       via  d37aca7cfd4c62d04b4033e5a0a3a8bad9ce510e (commit)
      from  e46c6d5440174bdf0dd3fe93bc501f76afb8c9a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d37aca7cfd4c62d04b4033e5a0a3a8bad9ce510e
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Mon Oct 26 17:40:37 2026 +0000

    grub: Use the UUID for root file systems on software RAID again
    
    GRUB 2.16 forces the device path for root file systems on diskfilter
    devices like software RAID (928df0770). Because the array is called
    /dev/md0 in the installer, but is being assembled as /dev/md127 at boot
    (there is no mdadm.conf in the initramfs), the kernel cannot find its
    root file system after a fresh installation.
    
    This restores the behaviour of GRUB 2.14 which has used the UUID.
    
    Fixes: #14713
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
    (cherry picked from commit 81bd9c000608332eca3563b37406fe1b1a309b7b)

-----------------------------------------------------------------------

Summary of changes:
 lfs/grub                                                      |  4 ++++
 .../grub/grub-2.16-Use-UUID-for-mdraid-root-filesystems.patch | 11 +++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 src/patches/grub/grub-2.16-Use-UUID-for-mdraid-root-filesystems.patch

Difference in files:
diff --git a/lfs/grub b/lfs/grub
index 6bfa7e964..b7496e907 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -95,6 +95,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.06-remove_os_prober_disabled_warning.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.02_disable_vga_fallback.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.16-Use-medany-instead-of-large-model-for-RISCV.patch
+
+	# Use the UUID for root file systems on software RAID like GRUB 2.14 did
+	# as the name of the array is not the same in the installer and at boot
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grub/grub-2.16-Use-UUID-for-mdraid-root-filesystems.patch
 	cd $(DIR_APP) && [ ! -e grub-core/extra_deps.lst ] && echo 'depends bli part_gpt' > grub-core/extra_deps.lst
 	cd $(DIR_APP) && autoreconf -vfi
 
diff --git a/src/patches/grub/grub-2.16-Use-UUID-for-mdraid-root-filesystems.patch b/src/patches/grub/grub-2.16-Use-UUID-for-mdraid-root-filesystems.patch
new file mode 100644
index 000000000..c9b65e91e
--- /dev/null
+++ b/src/patches/grub/grub-2.16-Use-UUID-for-mdraid-root-filesystems.patch
@@ -0,0 +1,11 @@
+--- grub-2.16.orig/util/grub.d/10_linux.in	2026-09-21 17:33:49.000000000 +0000
++++ grub-2.16/util/grub.d/10_linux.in	2026-10-26 17:39:04.871821016 +0000
+@@ -56,7 +56,7 @@
+ 	&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
+     || ( ! findfs UUID="${GRUB_DEVICE_UUID}" > /dev/null 2>&1 \
+ 	&& ! findfs PARTUUID="${GRUB_DEVICE_PARTUUID}" > /dev/null 2>&1 ) \
+-    || ( test -e "${GRUB_DEVICE}" && ( uses_abstraction "${GRUB_DEVICE}" lvm || uses_abstraction "${GRUB_DEVICE}" diskfilter ) ); then
++    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
+   LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+ elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
+     || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then


hooks/post-receive
--
IPFire 2.x development tree