nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

system: Rename (internal) grub-device to fs->boot-device. 

* gnu/system.scm (grub-device): Rename to...
(fs->boot-device): ... this.
(operating-system-grub.cfg): Adapt.
(operating-system-parameters-file): Adapt.

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
This commit is contained in:
Mathieu Othacehe 2017-04-15 14:37:01 +02:00 committed by Danny Milosavljevic
parent 07f812c404
commit 7085ca9690
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/system.scm
View File

@ -746,7 +746,7 @@ populate the \"old entries\" menu."
(label label) (label label)
;; The device where the kernel and initrd live. ;; The device where the kernel and initrd live.
(device (grub-device store-fs)) (device (fs->boot-device store-fs))
(device-mount-point (device-mount-point
(file-system-mount-point store-fs)) (file-system-mount-point store-fs))
@ -761,7 +761,7 @@ populate the \"old entries\" menu."
(grub-configuration-file (operating-system-bootloader os) entries (grub-configuration-file (operating-system-bootloader os) entries
#:old-entries old-entries))) #:old-entries old-entries)))
(define (grub-device fs) (define (fs->boot-device fs)
"Given FS, a <file-system> object, return a value suitable for use as the "Given FS, a <file-system> object, return a value suitable for use as the
device in a <menu-entry>." device in a <menu-entry>."
(case (file-system-title fs) (case (file-system-title fs)
@ -787,7 +787,7 @@ this file is the reconstruction of GRUB menu entries for old configurations."
#$(operating-system-kernel-arguments os)) #$(operating-system-kernel-arguments os))
(initrd #$initrd) (initrd #$initrd)
(store (store
(device #$(grub-device store)) (device #$(fs->boot-device store))
(mount-point #$(file-system-mount-point store)))) (mount-point #$(file-system-mount-point store))))
#:set-load-path? #f))) #:set-load-path? #f)))