summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2017-04-15 14:37:01 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-15 14:42:50 +0200
commit7085ca9690f6b3838ae3dc0f832c30e41681e835 (patch)
tree527f3f8d5fdf33e14f71f4cd942329ec6e2edc77 /gnu
parent07f812c404cd05dcac0d2801ad476f6e367ca6d4 (diff)
downloadguix-7085ca9690f6b3838ae3dc0f832c30e41681e835.tar.gz
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>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 369dc20b8f..69cbc8a081 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -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)))