[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: system: 'kernel->boot-label' now accepts inferior packages.
From: |
guix-commits |
Subject: |
01/03: system: 'kernel->boot-label' now accepts inferior packages. |
Date: |
Fri, 21 Dec 2018 12:07:34 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit bdc61ff97d26d5d87020d07dfd43c0a552bd3449
Author: Pkill -9 <address@hidden>
Date: Wed Dec 19 20:22:20 2018 +0000
system: 'kernel->boot-label' now accepts inferior packages.
* gnu/system.scm (kernel->boot-label): Get package name and version
using the functions for inferior packages if the kernel is an
inferior package. Return "GNU" if the kernel is not a package.
Signed-off-by: Ludovic Courtès <address@hidden>
---
gnu/system.scm | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index a5a8f40..146af7c 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -21,6 +21,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu system)
+ #:use-module (guix inferior)
#:use-module (guix store)
#:use-module (guix monads)
#:use-module (guix gexp)
@@ -905,10 +906,17 @@ listed in OS. The C library expects to find it under
(define (kernel->boot-label kernel)
"Return a label for the bootloader menu entry that boots KERNEL."
- (string-append "GNU with "
- (string-titlecase (package-name kernel)) " "
- (package-version kernel)
- " (beta)"))
+ (cond ((package? kernel)
+ (string-append "GNU with "
+ (string-titlecase (package-name kernel)) " "
+ (package-version kernel)
+ " (beta)"))
+ ((inferior-package? kernel)
+ (string-append "GNU with "
+ (string-titlecase (inferior-package-name kernel))
+ (inferior-package-version kernel)
+ " (beta)"))
+ (else "GNU")))
(define (store-file-system file-systems)
"Return the file system object among FILE-SYSTEMS that contains the store."