summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-05-24 17:15:16 +0200
committerLudovic Courtès <ludo@gnu.org>2015-05-24 17:15:16 +0200
commit328639e48f7ccb8e32fa42a8a0fbc2097fac38e3 (patch)
treea5c08a6c359e71e8857937a226eefed8c1ef6f11
parent4a1bf0907bd31e0fee6ce65427097287ccd482fb (diff)
downloadpatches-328639e48f7ccb8e32fa42a8a0fbc2097fac38e3.tar
patches-328639e48f7ccb8e32fa42a8a0fbc2097fac38e3.tar.gz
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.
-rw-r--r--guix/scripts/system.scm9
1 files changed, 4 insertions, 5 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 1feb821389..5a2bf7b4b7 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)))