aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2017-04-02 15:52:34 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2017-04-15 12:39:27 +0200
commitc2e9942b8fc8918c3e1d9612f99bea06be9ff81d (patch)
tree19dce9516f0b54cd2b3a54f43bf04b32535e37d5
parenta41134b44219a0aadbad4445586c571b0fbffbbd (diff)
downloadguix-c2e9942b8fc8918c3e1d9612f99bea06be9ff81d.tar
guix-c2e9942b8fc8918c3e1d9612f99bea06be9ff81d.tar.gz
system: Rename kernel->grub-label to kernel->boot-label.
* gnu/system.scm (kernel->grub-label): Rename to kernel->boot-label. (operating-system-grub.cfg): Adapt. (operating-system-parameters-file): Ditto. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
-rw-r--r--gnu/system.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 0f52351cf0..e74763d3d7 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -700,8 +700,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)
@@ -735,7 +735,7 @@ listed in OS. The C library expects to find it under
((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))
@@ -774,7 +774,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