me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Jan (janneke) Nieuwenhuizen 2020-05-10 15:31:45 +02:00 committed by Jan Nieuwenhuizen
parent 1244491a0d
commit e6cd8581c1
No known key found for this signature in database
GPG Key ID: F3C1A0D9C1D65273
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/system.scm
View File

@ -1091,9 +1091,13 @@ listed in OS. The C library expects to find it under
(locale-directory definitions (locale-directory definitions
#:libcs (operating-system-locale-libcs os))) #: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." "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-append "GNU with "
(string-titlecase (package-name kernel)) " " (string-titlecase (package-name kernel)) " "
(package-version 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) (define (operating-system-default-label os)
"Return the default label for OS, as it will appear in the bootloader menu "Return the default label for OS, as it will appear in the bootloader menu
entry." 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) (define (store-file-system file-systems)
"Return the file system object among FILE-SYSTEMS that contains the store." "Return the file system object among FILE-SYSTEMS that contains the store."