From 2d23e6f0515bc2e3a8a388cbe881ac372b162f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 25 Jun 2014 22:46:44 +0200
Subject: [PATCH] system: Factorize GRUB menu entry label.

* gnu/system.scm (kernel->grub-label): New procedure.
  (operating-system-grub.cfg): Use it.
---
 gnu/system.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index c2d31de15d..e1337da749 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -486,6 +486,13 @@ (define boot-file-systems
       ((initrd ((operating-system-initrd os) boot-file-systems)))
     (return #~(string-append #$initrd "/initrd"))))
 
+(define (kernel->grub-label kernel)
+  "Return a label for the GRUB menu entry that boots KERNEL."
+  (string-append "GNU system with "
+                 (string-titlecase (package-name kernel)) " "
+                 (package-version kernel)
+                 " (technology preview)"))
+
 (define (operating-system-grub.cfg os)
   "Return the GRUB configuration file for OS."
   (mlet* %store-monad
@@ -493,10 +500,7 @@ (define (operating-system-grub.cfg os)
        (root-fs ->  (operating-system-root-file-system os))
        (kernel ->   (operating-system-kernel os))
        (entries ->  (list (menu-entry
-                           (label (string-append
-                                   "GNU system with "
-                                   (package-full-name kernel)
-                                   " (technology preview)"))
+                           (label (kernel->grub-label kernel))
                            (linux kernel)
                            (linux-arguments
                             (list (string-append "--root="