aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-11-19 09:38:08 +0100
committerLudovic Courtès <ludo@gnu.org>2018-11-19 09:59:07 +0100
commit1d6669afef5d73f5be8a025941edb86890e71536 (patch)
tree0d36e583e4a4db037f32739c21e01d5e470437aa
parent5c40a69f7123f8f6ec4f1792bea73bb345a445b0 (diff)
downloadguix-1d6669afef5d73f5be8a025941edb86890e71536.tar
guix-1d6669afef5d73f5be8a025941edb86890e71536.tar.gz
guix system: Fix 'init'.
Fixes a regression introduced in 52ee4479ef26826a53b9929cd00ca7738be687b1, whereby 'install' would now be passed a <computed-file> object instead of a derivation. * guix/scripts/system.scm (install): Call 'lower-object' on BOOTCFG.
-rw-r--r--guix/scripts/system.scm30
1 files changed, 15 insertions, 15 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 6cf3704d88..00d2fe4829 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -251,21 +251,21 @@ the ownership of '~a' may be incorrect!~%")
(format (lift format %store-monad))
(populate (lift2 populate-root-file-system %store-monad)))
- (mbegin %store-monad
- ;; Copy the closure of BOOTCFG, which includes OS-DIR,
- ;; eventual background image and so on.
- (maybe-copy
- (derivation->output-path bootcfg))
-
- ;; Create a bunch of additional files.
- (format log-port "populating '~a'...~%" target)
- (populate os-dir target)
-
- (mwhen install-bootloader?
- (install-bootloader bootloader-installer
- #:bootcfg bootcfg
- #:bootcfg-file bootcfg-file
- #:target target)))))
+ (mlet %store-monad ((bootcfg (lower-object bootcfg)))
+ (mbegin %store-monad
+ ;; Copy the closure of BOOTCFG, which includes OS-DIR,
+ ;; eventual background image and so on.
+ (maybe-copy (derivation->output-path bootcfg))
+
+ ;; Create a bunch of additional files.
+ (format log-port "populating '~a'...~%" target)
+ (populate os-dir target)
+
+ (mwhen install-bootloader?
+ (install-bootloader bootloader-installer
+ #:bootcfg bootcfg
+ #:bootcfg-file bootcfg-file
+ #:target target))))))
;;;