guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Danny Milosavljevic
Subject: 04/04: system: Rename (internal) grub-device to fs->boot-device.
Date: Sat, 15 Apr 2017 08:43:12 -0400 (EDT)

dannym pushed a commit to branch master
in repository guix.

commit 7085ca9690f6b3838ae3dc0f832c30e41681e835
Author: Mathieu Othacehe <address@hidden>
Date:   Sat Apr 15 14:37:01 2017 +0200

    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 <address@hidden>
---
 gnu/system.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 369dc20..69cbc8a 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)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]