[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/24: system: Use 'hurd' package in label.
From: |
guix-commits |
Subject: |
11/24: system: Use 'hurd' package in label. |
Date: |
Sun, 17 May 2020 06:00:52 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit f093d39ba1b0183020b2a7694f29d92e25e47eb6
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
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 76bddf0..bc6a1eb 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -1084,9 +1084,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)))
@@ -1099,7 +1103,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."
- branch wip-hurd-vm created (now e4e1876), guix-commits, 2020/05/17
- 01/24: utils: Move 'reset-timestamps' out of database., guix-commits, 2020/05/17
- 02/24: system: vm: Do not register-closures when cross-building., guix-commits, 2020/05/17
- 03/24: system: vm: Build vm-image using native qemu., guix-commits, 2020/05/17
- 05/24: system: hurd: Add hurd-default-essential-services., guix-commits, 2020/05/17
- 11/24: system: Use 'hurd' package in label.,
guix-commits <=
- 08/24: system: Add 'hurd' field to <boot-parameters>., guix-commits, 2020/05/17
- 16/24: gnu: hurd: Create minimal "runsystem" script to invoke "rc"., guix-commits, 2020/05/17
- 07/24: bootloader: Add `<hurd-menu-entry>'., guix-commits, 2020/05/17
- 09/24: bootloader: grub: Add support for '<hurd-menu-entry>'., guix-commits, 2020/05/17
- 13/24: services: hurd: Add `hurd-etc-service'., guix-commits, 2020/05/17
- 12/24: system: examples: Add bare-hurd.tmpl., guix-commits, 2020/05/17
- 14/24: system: Add `hurd-activation'., guix-commits, 2020/05/17
- 17/24: services: Add `hurd-console-service-type'., guix-commits, 2020/05/17
- 18/24: services: Add `hurd-getty-service-type'., guix-commits, 2020/05/17
- 19/24: system: hurd: Populate services., guix-commits, 2020/05/17