aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorJan (janneke) Nieuwenhuizen <janneke@gnu.org>2020-05-10 15:31:45 +0200
committerJan Nieuwenhuizen <janneke@gnu.org>2020-06-08 13:51:19 +0200
commite6cd8581c192f739712013874dfa9690522ea9f1 (patch)
tree1b79d173306255030db9da3bba9f37a634b41b2b /gnu
parent1244491a0d5334e1589159a2ff67bbc967b9648b (diff)
downloadguix-e6cd8581c192f739712013874dfa9690522ea9f1.tar.gz
guix-e6cd8581c192f739712013874dfa9690522ea9f1.zip
system: Use 'hurd' package in label.
* gnu/system.scm (kernel->boot-label): Add keyword parameter 'hurd'. If set, use it for label. (operating-system-default-label): Call with it with operating-system-hurd.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system.scm11
1 files changed, 8 insertions, 3 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index 0722bcf771..a37c5ba4f3 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1091,9 +1091,13 @@ listed in OS. The C library expects to find it under
(locale-directory definitions
#:libcs (operating-system-locale-libcs os)))
-(define (kernel->boot-label kernel)
+(define* (kernel->boot-label kernel #:key hurd)
"Return a label for the bootloader menu entry that boots KERNEL."
- (cond ((package? kernel)
+ (cond ((package? hurd)
+ (string-append "GNU with the "
+ (string-titlecase (package-name hurd)) " "
+ (package-version hurd)))
+ ((package? kernel)
(string-append "GNU with "
(string-titlecase (package-name kernel)) " "
(package-version kernel)))
@@ -1106,7 +1110,8 @@ listed in OS. The C library expects to find it under
(define (operating-system-default-label os)
"Return the default label for OS, as it will appear in the bootloader menu
entry."
- (kernel->boot-label (operating-system-kernel os)))
+ (kernel->boot-label (operating-system-kernel os)
+ #:hurd (operating-system-hurd os)))
(define (store-file-system file-systems)
"Return the file system object among FILE-SYSTEMS that contains the store."