[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/27: system: Use 'hurd' package in label.
From: |
guix-commits |
Subject: |
17/27: system: Use 'hurd' package in label. |
Date: |
Fri, 29 May 2020 04:43:35 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit 67db1a9d58df8ed0ad8348798ea87baeeda31805
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sun May 10 15:31:45 2020 +0200
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.
---
gnu/system.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index a14ca08..50fc9da 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1095,9 +1095,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)))
@@ -1110,7 +1114,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."
- 13/27: system: Add 'hurd' field to <operating-system>., (continued)
- 13/27: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/29
- 14/27: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/29
- 05/27: vm: <virtual-machine> compiler honors system and target., guix-commits, 2020/05/29
- 06/27: vm: Shared-store script runs that native QEMU and Bash., guix-commits, 2020/05/29
- 07/27: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/29
- 08/27: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/29
- 15/27: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/29
- 19/27: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/29
- 11/27: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/29
- 16/27: bootloader: grub: Add support for multiboot., guix-commits, 2020/05/29
- 17/27: system: Use 'hurd' package in label.,
guix-commits <=
- 20/27: system: Add `hurd-activation'., guix-commits, 2020/05/29
- 22/27: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/29
- 24/27: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/29
- 27/27: system: bare-hurd.tmpl: Add openssh client and service., guix-commits, 2020/05/29
- 21/27: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/29
- 23/27: services: Add `hurd-console-service-type'., guix-commits, 2020/05/29
- 26/27: system: hurd: Remove 'cross-hurd-image' hack., guix-commits, 2020/05/29
- 25/27: system: hurd: Populate services., guix-commits, 2020/05/29
- 18/27: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/29