01/04: guix system: Always add zero previous entries in grub.cfg for 'init'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 328639e48f7ccb8e32fa42a8a0fbc2097fac38e3
Author: Ludovic Courtès <address@hidden>
Date:   Sun May 24 17:15:16 2015 +0200

    guix system: Always add zero previous entries in grub.cfg for 'init'.
    
    * guix/scripts/system.scm (grub.cfg): Remove.
      (perform-action): Call 'operating-system-grub.cfg' with the empty list as
      the 2nd argument when ACTION is 'init.
---
 guix/scripts/system.scm |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 1feb821..5a2bf7b 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -284,10 +284,6 @@ it atomically, and then run OS's activation script."
     ((disk-image)
      (system-disk-image os #:disk-image-size image-size))))
 
-(define (grub.cfg os)
-  "Return the GRUB configuration file for OS."
-  (operating-system-grub.cfg os (previous-grub-entries)))
-
 (define* (maybe-build drvs
                       #:key dry-run? use-substitutes?)
   "Show what will/would be built, and actually build DRVS, unless DRY-RUN? is
@@ -317,7 +313,10 @@ boot directly to the kernel or to the bootloader."
                                                 #:full-boot? full-boot?
                                                 #:mappings mappings))
        (grub      (package->derivation grub))
-       (grub.cfg  (grub.cfg os))
+       (grub.cfg  (operating-system-grub.cfg os
+                                             (if (eq? 'init action)
+                                                 '()
+                                                 (previous-grub-entries))))
        (drvs   -> (if (and grub? (memq action '(init reconfigure)))
                       (list sys grub grub.cfg)
                       (list sys)))