mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-18 13:36:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

bootloader: grub: Remove hardcoded partition number for the Hurd.

Browse source 
This supports using another than the default DISK0 PART1 and using LABEL or
UUID as root file-system specifier.  It still defaults to DISK0 PART1 if
the file-system cannot be found, i.e., lives only at the build side: A
virtual machine/childhurd build.

* gnu/build/file-systems.scm (%hurd-device-spec-regexp, %device-spec-regexp):
New variables.
(device-name->hurd-device-name, hurd-device-name->device-name,
device-spec->device, device-spec->device-name): Use them in new procedures.
* gnu/bootloader/grub.scm (make-grub-configuration): Use them to remove
hardcoded partition number (root-index 1).

Change-Id: I49fa93dacc09883dfb4d695402c5eac2e0e17286
This commit is contained in:
Janneke Nieuwenhuizen 2024-10-24 21:22:39 +02:00 committed by Jan (janneke) Nieuwenhuizen
parent 046d6d9f8e
commit fdb23d9db8
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
2 changed files with 71 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/bootloader/grub.scm
View file

@ -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, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020, 2023, 2024 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>
@ -34,6 +34,7 @@ (define-module (gnu bootloader grub)
#:use-module (guix gexp)
#:use-module (gnu artwork)
#:use-module (gnu bootloader)
#:use-module (gnu build file-systems)
#:use-module (gnu system uuid)
#:use-module (gnu system file-systems)
#:use-module (gnu system keyboard)
@ -45,6 +46,7 @@ (define-module (gnu bootloader grub)
#:use-module (ice-9 regex)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-2)
#:use-module (srfi srfi-26)
#:export (grub-theme
grub-theme?
grub-theme-image
@ -355,6 +357,11 @@ (define (grub-root-search device file)
((or #f (? string?))
#~(format #f "search --file --set ~a" #$file)))))
(define* (device->hurd-device-name device-spec #:key (disk "w"))
"Return DEVICE as a Hurd name spec: part:PART-NUMBER:device:DISKdDISK-INDEX."
(let ((device-name (canonicalize-device-spec device-spec)))
(device-name->hurd-device-name device-name #:disk disk)))
(define* (make-grub-configuration grub config entries
#:key
(locale #f)
@ -413,16 +420,16 @@ (define (menu-entry->gexp entry)
;; 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
(device-spec (and=> device file-system-device->string))
(device-name (and=> device-spec device-spec->device-name))
(modules (menu-entry-multiboot-modules entry)))
#~(format port "
menuentry ~s {
multiboot ~a root=part:~a:device:~ad0~a~a
multiboot ~a root=~a~a~a
}~%"
#$label
#$kernel
#$root-index
#$disk
#$(device-name->hurd-device-name device-name #:disk disk)
(string-join (list #$@arguments) " " 'prefix)
(string-join (map string-join '#$modules)
"\n module " 'prefix))))

58
gnu/build/file-systems.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2022 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2024 Nicolas Graves <ngraves@ngraves.fr>
;;; Copyright © 2024 Richard Sent <richard@freakingpenguin.com>
;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -53,6 +54,11 @@ (define-module (gnu build file-systems)
find-partition-by-luks-uuid
canonicalize-device-spec
device-name->hurd-device-name
device-spec->device
device-spec->device-name
hurd-device-name->device-name
read-partition-label
read-partition-uuid
read-luks-partition-uuid
@ -1431,4 +1437,56 @@ (define (mount-cifs source mount-point type flags options)
(or (file-system-mount-may-fail? fs)
(apply throw args))))))
(define %device-name-regexp "/dev/[hsvw]d([abcd])([0-9]*)")
(define %hurd-device-name-regexp "part:([0-9]*):device:[hw]d([0-9]*)")
(define (device-spec->device-name device-spec)
"Return DEVICE-SPEC as a Linux /dev/XdYZ device name, also catering for uuid
or label."
(cond ((string-match %device-name-regexp device-spec)
device-spec)
((string-match %hurd-device-name-regexp device-spec)
(hurd-device-name->device-name device-spec))
((string->uuid device-spec)
=>
(lambda (uuid) (false-if-exception (find-partition-by-uuid uuid))))
(else
(false-if-exception (find-partition-by-label device-spec)))))
(define* (device-name->hurd-device-name device-name #:key (disk "w"))
"Return DEVICE-NAME as a Hurd device name:
part:PART-NUMBER:device:DISKdDISK-INDEX
Default to part:1:device:DISKd0 if partition cannot be found."
(let* ((m (and=> device-name (cute string-match %device-name-regexp <>)))
(disk-char (and m (and=> (match:substring m 1)
(compose car string->list))))
(disk-index (or (and disk-char
(- (char->integer disk-char) (char->integer #\a)))
0))
(partition-number (or (and m (and=> (match:substring m 2)
string->number))
1)))
(format #f "part:~a:device:~ad~a" partition-number disk disk-index)))
(define* (hurd-device-name->device-name device-name #:key (disk "s"))
(let* ((m (and=> device-name (cute string-match %hurd-device-name-regexp <>)))
(disk-index-string (and=> m (cute match:substring <> 2)))
(disk-index (or (and=> disk-index-string string->number)
0))
(disk-index-char (integer->char (+ disk-index (char->integer #\a))))
(partition-string (and=> m (cute match:substring <> 1)))
(partition-number (or (and=> partition-string string->number)
1)))
(format #f "/dev/~ad~a~a" disk disk-index-char partition-number)))
(define (device-spec->device device-spec)
"Return DEVICE-SPEC as UUID, FILE-SYSTEM-LABEL, or DEVICE-SPEC."
(cond ((and=> (string->uuid device-spec)
find-partition-by-uuid)
(string->uuid device-spec))
((find-partition-by-label device-spec)
(file-system-label device-spec))
(else
device-spec)))
;;; file-systems.scm ends here