~ruther/guix-local: guix system: Always add zero previous entries in grub.cfg for 'init'.

328639e48f7ccb8e32fa42a8a0fbc2097fac38e3 — Ludovic Courtès 10 years ago 4a1bf09

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.

patch browse .tar.gz

1 files changed, 4 insertions(+), 5 deletions(-)

M guix/scripts/system.scm

M guix/scripts/system.scm => guix/scripts/system.scm +4 -5

@@ 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)))