GNU bug report logs - #26339
[PATCH 00/18] wip: Support non grub bootloaders.

Previous Next

Full log

Message #41 received at 26339 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <m.othacehe <at> gmail.com>
To: 26339 <at> debbugs.gnu.org
Cc: Mathieu Othacehe <m.othacehe <at> gmail.com>
Subject: [PATCH 12/18] system: Rename grub-device to fs->boot-device.
Date: Sun,  2 Apr 2017 15:52:36 +0200

* gnu/system.scm (grub-device): Rename to fs->boot-device,
(operating-system-grub.cfg): adapt,
(operating-system-parameters-file): ditto.
---
 gnu/system.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 9775e5be8..118816255 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -755,7 +755,7 @@ populate the \"old entries\" menu."
                            (boot-device boot-device)
 
                            ;; The device where the kernel and initrd live.
-                           (store-device (grub-device store-fs))
+                           (store-device (fs->boot-device store-fs))
                            (store-mount-point
                             (file-system-mount-point store-fs))
 
@@ -771,7 +771,7 @@ populate the \"old entries\" menu."
     ((bootloader-configuration-file-procedure (operating-system-bootloader os))
      (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)
@@ -804,7 +804,7 @@ configurations."
                    (boot-device #$boot-device)
                    (boot-type #$boot-type)
                    (store
-                    (device #$(grub-device store))
+                    (device #$(fs->boot-device store))
                     (mount-point #$(file-system-mount-point store))))
                 #:set-load-path? #f)))
 
-- 
2.12.2

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.