01/01: system: Make grub use <menu-entry> instead of <boot-parameters> again.

[Danny Milosavljevic]

dannym pushed a commit to branch master
in repository guix.

commit 958a1fda9e0ad41468cbdb88766e7c854dd32df4
Author: Danny Milosavljevic <address@hidden>
Date:   Sat Apr 15 22:02:38 2017 +0200

    system: Make grub use <menu-entry> instead of <boot-parameters> again.
    
    * gnu/system/grub.scm: Remove boot-parameters->menu-entry.
    (grub-configuration): Don't use boot-parameters->menu-entry.
    * gnu/system.scm (operating-system-bootcfg): Use menu-entry.
    * guix/scripts/system.scm (reinstall-grub): Use profile-grub-entries.
    (perform-action): Use profile-grub-entries.
---
 gnu/system.scm          | 11 +++++------
 gnu/system/grub.scm     | 13 ++-----------
 guix/scripts/system.scm |  6 +++---
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 4721668..69cbc8a 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -742,17 +742,16 @@ populate the \"old entries\" menu."
        (root-device -> (if (eq? 'uuid (file-system-title root-fs))
                            (uuid->string (file-system-device root-fs))
                            (file-system-device root-fs)))
-       (entries ->  (list (boot-parameters
+       (entries ->  (list (menu-entry
                            (label label)
-                           (root-device root-device)
 
                            ;; The device where the kernel and initrd live.
-                           (store-device (fs->boot-device store-fs))
-                           (store-mount-point
+                           (device (fs->boot-device store-fs))
+                           (device-mount-point
                             (file-system-mount-point store-fs))
 
-                           (kernel kernel)
-                           (kernel-arguments
+                           (linux kernel)
+                           (linux-arguments
                             (cons* (string-append "--root=" root-device)
                                    #~(string-append "--system=" #$system)
                                    #~(string-append "--load=" #$system
diff --git a/gnu/system/grub.scm b/gnu/system/grub.scm
index f2838d6..cde4b9e 100644
--- a/gnu/system/grub.scm
+++ b/gnu/system/grub.scm
@@ -267,15 +267,6 @@ code."
         (#f
          #~(format #f "search --file --set ~a" #$file)))))
 
-(define (boot-parameters->menu-entry conf)
-  (menu-entry
-   (label (boot-parameters-label conf))
-   (device (boot-parameters-store-device conf))
-   (device-mount-point (boot-parameters-store-mount-point conf))
-   (linux (boot-parameters-kernel conf))
-   (linux-arguments (boot-parameters-kernel-arguments conf))
-   (initrd (boot-parameters-initrd conf))))
-
 (define* (grub-configuration-file config entries
                                   #:key
                                   (system (%current-system))
@@ -285,7 +276,7 @@ code."
 <file-system> object.  OLD-ENTRIES is taken to be a list of menu entries
 corresponding to old generations of the system."
   (define all-entries
-    (append (map boot-parameters->menu-entry entries)
+    (append entries
             (grub-configuration-menu-entries config)))
 
   (define entry->gexp
@@ -332,7 +323,7 @@ set timeout=~a~%"
             #$@(if (pair? old-entries)
                    #~((format port "
 submenu \"GNU system, old configurations...\" {~%")
-                      #$@(map entry->gexp (map boot-parameters->menu-entry 
old-entries))
+                      #$@(map entry->gexp old-entries)
                       (format port "}~%"))
                    #~()))))
 
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 3ba420d..9d86efd 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -456,9 +456,9 @@ open connection to the store."
          ;; from the actual past values for this generation's entry.
          (grub-config (grub-configuration (device root-device)))
          ;; Make the specified system generation the default entry.
-         (entries (profile-boot-parameters %system-profile (list number)))
+         (entries (profile-grub-entries %system-profile (list number)))
          (old-generations (delv number (generation-numbers %system-profile)))
-         (old-entries (profile-boot-parameters %system-profile 
old-generations))
+         (old-entries (profile-grub-entries %system-profile old-generations))
          (grub.cfg (run-with-store store
                      (grub-configuration-file grub-config
                                               entries
@@ -643,7 +643,7 @@ output when building a system derivation, such as a disk 
image."
                       (operating-system-bootcfg os
                                                 (if (eq? 'init action)
                                                     '()
-                                                    
(profile-boot-parameters)))))
+                                                    (profile-grub-entries)))))
 
        ;; For 'init' and 'reconfigure', always build GRUB.CFG, even if
        ;; --no-grub is passed, because GRUB.CFG because we then use it as a GC