branch wip-hurd-vm updated: squash! system: Use 'hurd' package in label.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

The following commit(s) were added to refs/heads/wip-hurd-vm by this push:
     new cf9deff  squash! system: Use 'hurd' package in label.
cf9deff is described below

commit cf9deff16a15d86635c9b78c549de88064946de4
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Mon May 11 15:23:04 2020 +0200

    squash! system: Use 'hurd' package in label.
---
 gnu/system.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 44962ca..d5d6638 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1103,7 +1103,7 @@ 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? hurd)
          (string-append "GNU with the "
@@ -1122,7 +1122,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."