[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26339: [PATCH 12/18] system: Rename grub-device to fs->boot-device.
From: |
Mathieu Othacehe |
Subject: |
bug#26339: [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
- bug#26339: [PATCH 03/18] scripts: system: Rename --no-grub option to --no-bootloader., (continued)
bug#26339: [PATCH 05/18] system: Rename operating-system-grub.cfg to operating-system-bootcfg., Mathieu Othacehe, 2017/04/02
bug#26339: [PATCH 02/18] system: Add extlinux support., Mathieu Othacehe, 2017/04/02
bug#26339: [PATCH 07/18] system: Add bootloader type., Mathieu Othacehe, 2017/04/02
bug#26339: [PATCH 12/18] system: Rename grub-device to fs->boot-device.,
Mathieu Othacehe <=
bug#26339: [PATCH 08/18] bootloader: Stop using grub module., Mathieu Othacehe, 2017/04/02
bug#26339: [PATCH 06/18] vm: Reword grub.cfg to boot.cfg, Mathieu Othacehe, 2017/04/02
bug#26339: [PATCH 10/18] system: Rename kernel->grub-label to kernel->boot-label., Mathieu Othacehe, 2017/04/02
bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Mathieu Othacehe, 2017/04/02