[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/89: bootloader: grub: Use rumpdisk-style root when booting with "noid
From: |
guix-commits |
Subject: |
23/89: bootloader: grub: Use rumpdisk-style root when booting with "noide". |
Date: |
Tue, 20 Jun 2023 05:58:53 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit df4cbc4f2dc8e15a76c349181d1b4668216e1b17
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
- 88/89: DRAFT hurd-boot: Support second boot., (continued)
- 88/89: DRAFT hurd-boot: Support second boot., guix-commits, 2023/06/20
- 03/89: gnu: gnumach-headers: Cross-build without relying on x86., guix-commits, 2023/06/20
- 08/89: gnu: gnumach: Update to 1.8+git20221224., guix-commits, 2023/06/20
- 09/89: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/06/20
- 04/89: gnu: hurd: Update supported systems., guix-commits, 2023/06/20
- 11/89: squash! gnu: mig: Update to 04bfe7a91223ba15d868f7165e49328b1c6e86c3., guix-commits, 2023/06/20
- 12/89: gnu: hurd: Update to v0.9.git20230216., guix-commits, 2023/06/20
- 18/89: gnu: parted: Support building for the Hurd., guix-commits, 2023/06/20
- 19/89: gnu: hurd: Add rumpkernel., guix-commits, 2023/06/20
- 21/89: services: childhurd: Bump default qemu memory to 2048MB., guix-commits, 2023/06/20
- 23/89: bootloader: grub: Use rumpdisk-style root when booting with "noide".,
guix-commits <=
- 15/89: gnu: hurd: Update libpciaccess to 0.17., guix-commits, 2023/06/20
- 17/89: gnu: hurd-minimal: Include libshouldbeinlibc and libstore., guix-commits, 2023/06/20
- 24/89: gnu: gnumach: Support "noide" argument., guix-commits, 2023/06/20
- 25/89: gnu: netdde: Resurrect and update to 2.6.32.65-2-e67c284ac1., guix-commits, 2023/06/20
- 26/89: hurd-boot: Cater for netdde., guix-commits, 2023/06/20
- 27/89: system: hurd: Add netdde to %base-packages/hurd., guix-commits, 2023/06/20
- 29/89: gnu: gnumach: Disable builtin networking., guix-commits, 2023/06/20
- 30/89: gnu: commencement: Add autoconf-boot0., guix-commits, 2023/06/20
- 53/89: gnu: libgpg-error: Skip failing test on the Hurd., guix-commits, 2023/06/20
- 64/89: gnu: openssl-1.1: Fix shared build for the Hurd., guix-commits, 2023/06/20