summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-07-23 18:11:24 +0200
committerLudovic Courtès <ludo@gnu.org>2014-07-23 18:20:56 +0200
commitb6debdaa22931646fbbc116048732c6bcb37af3c (patch)
treeffcda9e97b0f81f6a32540ccf4f6c6791d069158
parent742160428e3acde63c704e668542ae9b1a7c404b (diff)
downloadguix-b6debdaa22931646fbbc116048732c6bcb37af3c.tar.gz
guix system: Fix type error in 'reconfigure'.
Partly fixes <http://bugs.gnu.org/18082>.
Reported by Mark H Weaver <mhw@netris.org>.

* guix/scripts/system.scm (perform-action) <reconfigure>: Pass the
  output file name of GRUB.CFG to 'install-grub'.
-rw-r--r--guix/scripts/system.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 57f42215ee..5737807d8b 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -299,7 +299,8 @@ actions."
              (mlet %store-monad ((% (switch-to-system os)))
                (when grub?
                  (unless (false-if-exception
-                          (install-grub grub.cfg device "/"))
+                          (install-grub (derivation->output-path grub.cfg)
+                                        device "/"))
                    (leave (_ "failed to install GRUB on device '~a'~%")
                           device)))
                (return #t)))