This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch hurd-team
in repository guix.
The following commit(s) were added to refs/heads/hurd-team by this push:
new 79a79332a4 bootloader: gnub: Always use RumpDisk for the 64-bit Hurd.
79a79332a4 is described below
commit 79a79332a49d19f278ba636ee853cb9de34192b8
Author: Janneke Nieuwenhuizen <[email protected]>
AuthorDate: Tue Mar 3 10:42:45 2026 +0100
bootloader: gnub: Always use RumpDisk 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 <[email protected]>
;;; Copyright © 2017 Leo Famulari <[email protected]>
;;; Copyright © 2017, 2020 Mathieu Othacehe <[email protected]>
-;;; Copyright © 2019, 2020, 2023, 2024 Janneke Nieuwenhuizen <[email protected]>
+;;; Copyright © 2019, 2020, 2023, 2024, 2026 Janneke Nieuwenhuizen
<[email protected]>
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <[email protected]>
;;; Copyright © 2020 Maxim Cournoyer <[email protected]>
;;; Copyright © 2020 Stefan <[email protected]>
@@ -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)))
