me
/
guix
Archived
1
0
Fork 0
Code

gnu: system: Fix computation of boot parameters for LUKS devices. 

* gnu/system.scm (read-boot-parameters): Fix store-device computation for root
devices of type "device", like the LUKS partition described in the manual.
From a patch from https://debbugs.gnu.org/cgi/bugreport.cgi?bug=28445#23.

Signed-off-by: Andy Wingo <wingo@igalia.com>
master
Andy Wingo 2017-09-20 15:11:41 +02:00
parent c68c201fdd
commit 96bc651800
No known key found for this signature in database
GPG Key ID: A8803732E4436885
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gnu/system.scm
View File

@ -278,6 +278,8 @@ directly by the user."
(store-device
(match (assq 'store rest)
(('store ('device #f) _ ...)
root-device)
(('store ('device device) _ ...)
(device-sexp->device device))
(_ ;the old format
@ -909,8 +911,7 @@ listed in OS. The C library expects to find it under
"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))
((uuid label device) (file-system-device fs))
(else #f)))
(define (operating-system-boot-parameters os system.drv root-device)