ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-23 21:17:11 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

system: Avoid using device paths in <menu-entry> device field.

Browse source 
This fixes a regression introduced by
1ef8b72a7f, in which we would incorrectly use a
device path in a label-based grub root search command, e.g. 'search --label
--set /dev/sda4'.

* gnu/system.scm (grub-device): New procedure.
(operating-system-grub.cfg, operating-system-parameters-file): Use it.
(read-boot-parameters): Handle device paths correctly.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Chris Marusich 2016-11-03 06:10:28 -07:00 committed by Ludovic Courtès
parent f4dc22bcd9
commit 3382bfe9ea
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/system.scm
View file

@ -60,6 +60,7 @@ (define-module (gnu system)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35)
#:use-module (rnrs bytevectors)
#:export (operating-system
operating-system?
@ -738,7 +739,7 @@ (define* (operating-system-grub.cfg os #:optional (old-entries '()))
(label label)
;; The device where the kernel and initrd live.
(device (file-system-device store-fs))
(device (grub-device store-fs))
(device-mount-point
(file-system-mount-point store-fs))
@ -753,6 +754,14 @@ (define* (operating-system-grub.cfg os #:optional (old-entries '()))
(grub-configuration-file (operating-system-bootloader os) entries
#:old-entries old-entries)))
(define (grub-device fs)
"Given FS, a <file-system> object, return a value suitable for use as the
device in a <menu-entry>."
(case (file-system-title fs)
((uuid) (file-system-device fs))
((label) (file-system-device fs))
(else #f)))
(define (operating-system-parameters-file os)
"Return a file that describes the boot parameters of OS. The primary use of
this file is the reconstruction of GRUB menu entries for old configurations."
@ -771,10 +780,7 @@ (define (operating-system-parameters-file os)
#$(operating-system-kernel-arguments os))
(initrd #$initrd)
(store
(device #$(case (file-system-title store)
((uuid) (file-system-device store))
((label) (file-system-device store))
(else #f)))
(device #$(grub-device store))
(mount-point #$(file-system-mount-point store))))
#:set-load-path? #f)))
@ -836,7 +842,11 @@ (define (read-boot-parameters port)
(('store ('device device) _ ...)
device)
(_ ;the old format
root)))
;; Root might be a device path like "/dev/sda1", which is not a
;; suitable GRUB device identifier.
(if (string-prefix? "/" root)
#f
root))))
(store-mount-point
(match (assq 'store rest)