~ruther/guix-local: guix system: Always build grub.cfg for 'init' and 'reconfigure'.

a70436183aeb6a861cc43e297b5a33b777dfe1b3 — Ludovic Courtès 10 years ago beca080

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

Fixes <http://bugs.gnu.org/21068>.
Reported by Germano Gabbianelli <tyrion.mx@gmail.com>
and Mark H Weaver <mhw@netris.org>.

* guix/scripts/system.scm (perform-action): Always add GRUB.CFG to DRVS
  for 'init' and 'reconfigure'.

Co-authored-by: Mark H Weaver <mhw@netris.org>

patch browse .tar.gz

1 files changed, 8 insertions(+), 2 deletions(-)

M guix/scripts/system.scm

M guix/scripts/system.scm => guix/scripts/system.scm +8 -2

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