12/15: PRELIMINARY: Fix problem with 'guix system init --nogrub'.

[Mark H. Weaver]

mhw pushed a commit to branch wip-loongson2f
in repository guix.

commit decb345a2b7a8a577125300ed9c5e33b3b2a99b9
Author: Mark H Weaver <address@hidden>
Date:   Sun Aug 9 18:45:26 2015 -0400

    PRELIMINARY: Fix problem with 'guix system init --nogrub'.
---
 guix/scripts/system.scm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 45f5982..6ec1f29 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -331,8 +331,10 @@ boot directly to the kernel or to the bootloader."
                                              (if (eq? 'init action)
                                                  '()
                                                  (previous-grub-entries))))
-       (drvs   -> (if (and grub? (memq action '(init reconfigure)))
-                      (list sys grub grub.cfg)
+       (drvs   -> (if (memq action '(init reconfigure))
+                      (if grub?
+                          (list sys grub.cfg grub)
+                          (list sys grub.cfg))
                       (list sys)))
        (%         (maybe-build drvs #:dry-run? dry-run?
                                #:use-substitutes? use-substitutes?)))