From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4jD1ck2QsFz2xXH for ; Mon, 26 Oct 2026 18:00:22 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail01.haj.ipfire.org", Issuer "YR1" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4jD1ck2CsJz2xNp for ; Mon, 26 Oct 2026 18:00:22 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "people01.haj.ipfire.org", Issuer "YE1" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4jD1ck1M4zz2cJ for ; Mon, 26 Oct 2026 18:00:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1793037622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=b6GuoEoNfcEtdiby3i6Nzax/aqU2x3/SIwquNZJjf4Q=; b=xyveXfGZVPRlOGu6Zlr2/K506KYMTxEekn4V2+8oLd4fuLR4C0PSWQNLvzSCaEm3mliNlN xP4ijMq0Vn1Ln5Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1793037622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=b6GuoEoNfcEtdiby3i6Nzax/aqU2x3/SIwquNZJjf4Q=; b=oml5OoYaetKkUtg6kHuImMzPRypYrGDNeBoToXbOA5QxcEjKlupW0kjSnMT5aTT9AbU1Wp Kna+oxUz62cmVAGMZPDcmN29/voz7xB975k+GjIIpvlMcpGsvYDmbAl6xudOmUeEqn5pW3 F0uKekY/etVW3ARLlF+R7/69f7Yq1xI21TweeN0ZmTGKPsX6lDSSHbk4n7leMqR8chmfkc b3PmBFL6SA6KKHApeugTBQt3tdbtFyNRtqeOLtUtWe0jAdWe3CRY2L9FvjeV5m8UazlGwx HBpopDfBgnGR3T7lZAeT+VCsHzUpwNI2dSgVdkY2fSX059Bp8PFashCr48w0lw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4jD1ck0tchz2xVw; Mon, 26 Oct 2026 18:00:22 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d37aca7cfd4c62d04b4033e5a0a3a8bad9ce510e X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e46c6d5440174bdf0dd3fe93bc501f76afb8c9a2 X-Git-Newrev: d37aca7cfd4c62d04b4033e5a0a3a8bad9ce510e Message-Id: <4jD1ck0tchz2xVw@people01.haj.ipfire.org> Date: Mon, 26 Oct 2026 18:00:21 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 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 (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