diff options
| author | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2016-03-21 12:22:31 -0400 |
| commit | 09ec508a4c14d1bc09622d98f796548d79ab0552 (patch) | |
| tree | 86cc5a2a67d35ad796bfa33d67869d670d65822e /guix/scripts/system.scm | |
| parent | 2dbed47f5c09347c9af42c5f5bacfccbc1ab4aff (diff) | |
| parent | 71cafa0472a15f2234e24d3c6d8019ebb38685b0 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/system.scm')
| -rw-r--r-- | guix/scripts/system.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 401aa8b60a..8ebeb4d595 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -21,6 +21,7 @@ #:use-module (guix config) #:use-module (guix ui) #:use-module (guix store) + #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix derivations) #:use-module (guix packages) @@ -127,7 +128,8 @@ TARGET, and register them." (define (install-grub* grub.cfg device target) "This is a variant of 'install-grub' with error handling, lifted in %STORE-MONAD" - (let* ((gc-root (string-append %gc-roots-directory "/grub.cfg")) + (let* ((gc-root (string-append target %gc-roots-directory + "/grub.cfg")) (temp-gc-root (string-append gc-root ".new")) (delete-file (lift1 delete-file %store-monad)) (make-symlink (lift2 switch-symlinks %store-monad)) @@ -685,6 +687,7 @@ Build the operating system declared in FILE according to ACTION.\n")) ;; Alist of default option values. `((system . ,(%current-system)) (substitutes? . #t) + (graft? . #t) (build-hook? . #t) (max-silent-time . 3600) (verbosity . 0) @@ -812,6 +815,7 @@ argument list and OPTS is the option alist." parse-sub-command)) (args (option-arguments opts)) (command (assoc-ref opts 'action))) - (process-command command args opts)))) + (parameterize ((%graft? (assoc-ref opts 'graft?))) + (process-command command args opts))))) ;;; system.scm ends here |