From a6e48bf329d914b91731d58423fe4cb503252cb1 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Tue, 3 Mar 2026 10:42:45 +0100 Subject: [PATCH] bootloader: grub: Always use rumpdisk-style root for the 64-bit Hurd. * gnu/bootloader/grub.scm (make-grub-configuration): When building for the 64-bit Hurd, use RumpDisk root device name. Change-Id: Iffa9af0a504ea698d055208ac9ed66ea7eac03d7 --- gnu/bootloader/grub.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index a6a700aee6..88c8d13c54 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2016 Chris Marusich ;;; Copyright © 2017 Leo Famulari ;;; Copyright © 2017, 2020 Mathieu Othacehe -;;; Copyright © 2019, 2020, 2023, 2024 Janneke Nieuwenhuizen +;;; Copyright © 2019, 2020, 2023, 2024, 2026 Janneke Nieuwenhuizen ;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2020 Stefan @@ -427,8 +427,11 @@ when booting a root file system on a Btrfs subvolume." (arguments (menu-entry-multiboot-arguments entry)) ;; Choose between device names as understood by Mach's built-in ;; IDE driver ("hdX") and those understood by rumpdisk ("wdX" - ;; in the "noide" case). - (disk (if (member "noide" arguments) "w" "h")) + ;; in the "noide" case). There are no IDE drivers in Mach for + ;; hurd64, so always use rumpdisk there. + (rumpdisk? (or (target-hurd64?) + (member "noide" arguments))) + (disk (if rumpdisk? "w" "h")) (device-spec (and=> device file-system-device->string)) (device-name (and=> device-spec device-spec->device-name)) (modules (menu-entry-multiboot-modules entry)))