01/02: guix system: Always build grub.cfg for 'init' and 'reconfigure'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit a70436183aeb6a861cc43e297b5a33b777dfe1b3
Author: Ludovic Courtès <address@hidden>
Date:   Mon Nov 2 22:44:17 2015 +0100

    guix system: Always build grub.cfg for 'init' and 'reconfigure'.
    
    Fixes <http://bugs.gnu.org/21068>.
    Reported by Germano Gabbianelli <address@hidden>
    and Mark H Weaver <address@hidden>.
    
    * guix/scripts/system.scm (perform-action): Always add GRUB.CFG to DRVS
      for 'init' and 'reconfigure'.
    
    Co-authored-by: Mark H Weaver <address@hidden>
---
 guix/scripts/system.scm |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 7a8a751..0d54d45 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 <http://bugs.gnu.org/21068>.
+       (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)