[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#41541: [PATCH 5/8] system: Use 'hurd' package in label.
From: |
Jan (janneke) Nieuwenhuizen |
Subject: |
bug#41541: [PATCH 5/8] system: Use 'hurd' package in label. |
Date: |
Thu, 4 Jun 2020 15:59:11 +0200 |
* 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.
---
gnu/system.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index a96a6e6f2c..b814181c69 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1098,9 +1098,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)))
@@ -1113,7 +1117,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."
--
2.26.2
- bug#41541: [PATCH 0/9] Merge wip-hurd-vm "last review round", Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 1/8] system: Add 'hurd' field to <operating-system>., Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 3/8] system: Add 'multiboot-modules' field to <boot-parameters>., Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 5/8] system: Use 'hurd' package in label.,
Jan (janneke) Nieuwenhuizen <=
- bug#41541: [PATCH 2/8] bootloader: Extend `<menu-entry>' for multiboot., Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 7/8] services: hurd: Add `hurd-etc-service'., Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 4/8] bootloader: grub: Add support for multiboot., Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 6/8] system: examples: Add bare-hurd.tmpl., Jan (janneke) Nieuwenhuizen, 2020/06/04
- bug#41541: [PATCH 8/8] system: Add `hurd-activation'., Jan (janneke) Nieuwenhuizen, 2020/06/04