[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/28: system: Use 'hurd' package in label.
From: |
guix-commits |
Subject: |
17/28: system: Use 'hurd' package in label. |
Date: |
Sat, 30 May 2020 11:20:16 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit b8bccce071680e1d1f77fa4514e5b24093a6737a
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 8a40068..1d00453 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."
- 02/28: vm: 'expression->derivation-in-linux-vm' always returns a native build., (continued)
- 02/28: vm: 'expression->derivation-in-linux-vm' always returns a native build., guix-commits, 2020/05/30
- 07/28: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/30
- 09/28: image: Add Hurd support., guix-commits, 2020/05/30
- 06/28: vm: Shared-store script runs that native QEMU and Bash., guix-commits, 2020/05/30
- 10/28: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/30
- 11/28: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/30
- 12/28: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/30
- 15/28: system: Add 'multiboot-modules' field to <boot-parameters>., guix-commits, 2020/05/30
- 18/28: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/30
- 13/28: system: Add 'hurd' field to <operating-system>., guix-commits, 2020/05/30
- 17/28: system: Use 'hurd' package in label.,
guix-commits <=
- 16/28: bootloader: grub: Add support for multiboot., guix-commits, 2020/05/30
- 23/28: services: Add `hurd-console-service-type'., guix-commits, 2020/05/30
- 26/28: system: hurd: Remove 'cross-hurd-image' hack., guix-commits, 2020/05/30
- 21/28: services: hurd: Use activation-service, hurd-etc-service., guix-commits, 2020/05/30
- 27/28: system: bare-hurd.tmpl: Add openssh client and service., guix-commits, 2020/05/30
- 24/28: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/30
- 28/28: syscalls: set-thread-name, thread-name: Stub for the Hurd., guix-commits, 2020/05/30
- 19/28: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/30
- 20/28: system: Add `hurd-activation'., guix-commits, 2020/05/30
- 22/28: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/30