[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26339: [PATCH 10/18] system: Rename kernel->grub-label to kernel->bo
From: |
Mathieu Othacehe |
Subject: |
bug#26339: [PATCH 10/18] system: Rename kernel->grub-label to kernel->boot-label. |
Date: |
Sun, 2 Apr 2017 15:52:34 +0200 |
* gnu/system.scm (kernel->grub-label): Rename to kernel->boot-label.
(operating-system-grub.cfg): Adapt.
(operating-system-parameters-file): Ditto.
---
gnu/system.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index a9b05806a..6c41fe814 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -702,8 +702,8 @@ listed in OS. The C library expects to find it under
(locale-directory definitions
#:libcs (operating-system-locale-libcs os)))
-(define (kernel->grub-label kernel)
- "Return a label for the GRUB menu entry that boots KERNEL."
+(define (kernel->boot-label kernel)
+ "Return a label for the bootloader menu entry that boots KERNEL."
(string-append "GNU with "
(string-titlecase (package-name kernel)) " "
(package-version kernel)
@@ -737,7 +737,7 @@ populate the \"old entries\" menu."
((system (operating-system-derivation os))
(root-fs -> (operating-system-root-file-system os))
(store-fs -> (operating-system-store-file-system os))
- (label -> (kernel->grub-label (operating-system-kernel os)))
+ (label -> (kernel->boot-label (operating-system-kernel os)))
(kernel -> (operating-system-kernel-file os))
(initrd (operating-system-initrd-file os))
(root-device -> (if (eq? 'uuid (file-system-title root-fs))
@@ -777,7 +777,7 @@ this file is the reconstruction of GRUB menu entries for
old configurations."
(mlet %store-monad ((initrd (operating-system-initrd-file os))
(root -> (operating-system-root-file-system os))
(store -> (operating-system-store-file-system os))
- (label -> (kernel->grub-label
+ (label -> (kernel->boot-label
(operating-system-kernel os))))
(gexp->file "parameters"
#~(boot-parameters
--
2.12.2
- bug#26339: [PATCH 07/18] system: Add bootloader type., (continued)
bug#26339: [PATCH 12/18] system: Rename grub-device to fs->boot-device., Mathieu Othacehe, 2017/04/02
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 <=
bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Mathieu Othacehe, 2017/04/02
- bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Danny Milosavljevic, 2017/04/15
- bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Mathieu Othacehe, 2017/04/15
- bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Danny Milosavljevic, 2017/04/16
- bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Mathieu Othacehe, 2017/04/17
- bug#26339: [PATCH 04/18] bootloader: Add install procedures and use them., Ludovic Courtès, 2017/04/18
bug#26339: [PATCH 09/18] scripts: system: Move save-load-path-excursion and save-environment-excursion macros to the top., Mathieu Othacehe, 2017/04/02