summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorPkill -9 <pkill9@runbox.com>2018-12-19 20:22:20 +0000
committerLudovic Courtès <ludo@gnu.org>2018-12-21 18:07:28 +0100
commitbdc61ff97d26d5d87020d07dfd43c0a552bd3449 (patch)
tree0d2a9f24006e06ae73c9a293d9473e8d50492728 /gnu
parent4b33a74138740101042c31bef304b8ba35e81126 (diff)
downloadpatches-bdc61ff97d26d5d87020d07dfd43c0a552bd3449.tar
patches-bdc61ff97d26d5d87020d07dfd43c0a552bd3449.tar.gz
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 <ludo@gnu.org>
Diffstat (limited to 'gnu')
-rw-r--r--gnu/system.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/system.scm b/gnu/system.scm
index a5a8f40d66..146af7cf08 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."