From a70436183aeb6a861cc43e297b5a33b777dfe1b3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 Nov 2015 22:44:17 +0100 Subject: guix system: Always build grub.cfg for 'init' and 'reconfigure'. Fixes . Reported by Germano Gabbianelli and Mark H Weaver . * guix/scripts/system.scm (perform-action): Always add GRUB.CFG to DRVS for 'init' and 'reconfigure'. Co-authored-by: Mark H Weaver --- guix/scripts/system.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'guix/scripts/system.scm') diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 7a8a751df9..0d54d453db 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -447,8 +447,14 @@ building anything." (if (eq? 'init action) '() (previous-grub-entries))))) - (drvs -> (if (and grub? (memq action '(init reconfigure))) - (list sys grub grub.cfg) + + ;; 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 + ;; root. See . + (drvs -> (if (memq action '(init reconfigure)) + (if grub? + (list sys grub.cfg grub) + (list sys grub.cfg)) (list sys))) (% (if derivations-only? (return (for-each (compose println derivation-file-name) -- cgit v1.2.3