~ruther/guix-local

7085ca9690f6b3838ae3dc0f832c30e41681e835 — Mathieu Othacehe 9 years ago 07f812c
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>
1 files changed, 3 insertions(+), 3 deletions(-)

M gnu/system.scm
M gnu/system.scm => gnu/system.scm +3 -3
@@ 746,7 746,7 @@ populate the \"old entries\" menu."
                           (label label)

                           ;; The device where the kernel and initrd live.
                           (device (grub-device store-fs))
                           (device (fs->boot-device store-fs))
                           (device-mount-point
                            (file-system-mount-point store-fs))



@@ 761,7 761,7 @@ populate the \"old entries\" menu."
    (grub-configuration-file (operating-system-bootloader os) 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
device in a <menu-entry>."
  (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))
                   (initrd #$initrd)
                   (store
                    (device #$(grub-device store))
                    (device #$(fs->boot-device store))
                    (mount-point #$(file-system-mount-point store))))
                #:set-load-path? #f)))