From: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 10 May 2020 13:31:45 +0000 (+0200)
Subject: system: Use 'hurd' package in label.
X-Git-Url: http://git.hcoop.net/jackhill/guix/guix.git/commitdiff_plain/e6cd8581c192f739712013874dfa9690522ea9f1

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.
---

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."