~ruther/guix-local

96bc6518002c3b2ad9f15cf36991b20bebcbbe8a — Andy Wingo 8 years ago c68c201 
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>
patch browse .tar.gz 
1 files changed, 3 insertions(+), 2 deletions(-)

M gnu/system.scm

M gnu/system.scm => gnu/system.scm +3 -2
@@ 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)