[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/84: bootloader: grub: Use rumpdisk-style root when booting with "noid
From: |
guix-commits |
Subject: |
23/84: bootloader: grub: Use rumpdisk-style root when booting with "noide". |
Date: |
Wed, 14 Jun 2023 06:23:55 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit 8895471645efc53deb1e3faaeca855f8031d8ac9
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Tue May 23 16:03:53 2023 +0200
bootloader: grub: Use rumpdisk-style root when booting with "noide".
* gnu/bootloader/grub.scm (make-grub-configuration): When "noide" is in
arguments, use device name "wd0" rather than "hd0".
---
gnu/bootloader/grub.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm
index ecd44e7f3c..5f3fcd7074 100644
--- a/gnu/bootloader/grub.scm
+++ b/gnu/bootloader/grub.scm
@@ -3,7 +3,7 @@
;;; Copyright © 2016 Chris Marusich <cmmarusich@gmail.com>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com>
-;;; Copyright © 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas <rosen644835@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Stefan <stefan-guix@vodafonemail.de>
@@ -404,17 +404,23 @@ when booting a root file system on a Btrfs subvolume."
#$linux (string-join (list #$@arguments))
#$initrd)))
(multiboot-kernel
- (let ((kernel (menu-entry-multiboot-kernel entry))
- (arguments (menu-entry-multiboot-arguments entry))
- (modules (menu-entry-multiboot-modules entry))
- (root-index 1)) ; XXX EFI will need root-index 2
+ (let* ((kernel (menu-entry-multiboot-kernel entry))
+ (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"))
+ (modules (menu-entry-multiboot-modules entry))
+ (root-index 1)) ; XXX EFI will need root-index 2
#~(format port "
menuentry ~s {
- multiboot ~a root=device:hd0s~a~a~a
+ multiboot ~a root=part:~a:device:~ad0~a~a
}~%"
#$label
#$kernel
- #$root-index (string-join (list #$@arguments) " " 'prefix)
+ #$root-index
+ #$disk
+ (string-join (list #$@arguments) " " 'prefix)
(string-join (map string-join '#$modules)
"\n module " 'prefix))))
(chain-loader
- 43/84: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., (continued)
- 43/84: gnu: gettext-minimal: Remove XFAIL_TESTS for the Hurd., guix-commits, 2023/06/14
- 36/84: Revert "gnu: libunistring: Fix make check for the Hurd.", guix-commits, 2023/06/14
- 56/84: gnu: curl: Skip failing test for the Hurd., guix-commits, 2023/06/14
- 71/84: gnu: doxygen: Fix build for the Hurd., guix-commits, 2023/06/14
- 76/84: gnu: harfbuzz: Support build for the Hurd., guix-commits, 2023/06/14
- 72/84: gnu: graphite2: Skip test for the Hurd., guix-commits, 2023/06/14
- 82/84: DRAFT hurd: Support second boot., guix-commits, 2023/06/14
- 62/84: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/06/14
- 21/84: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/14
- 03/84: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/14
- 23/84: bootloader: grub: Use rumpdisk-style root when booting with "noide".,
guix-commits <=
- 52/84: gnu: c-ares: Skip failing tests for the Hurd., guix-commits, 2023/06/14
- 54/84: gnu: libgcrypt: Skip hanging benchmark tests for the Hurd., guix-commits, 2023/06/14
- 60/84: gnu: e2fsprogs: Skip failing tests for the Hurd., guix-commits, 2023/06/14
- 83/84: DRAFT hurd-boot: Support second boot., guix-commits, 2023/06/14
- 84/84: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/06/14
- 65/84: gnu: ruby-2.6: Skip test for the Hurd., guix-commits, 2023/06/14
- 81/84: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/06/14
- 17/84: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/14
- 02/84: gnu: glibc/hurd-headers: Properly cross-build., guix-commits, 2023/06/14
- 33/84: gnu: commencement: mig-boot0: Update to 1.8+git20230520., guix-commits, 2023/06/14