diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-09-22 16:38:48 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-09-22 16:38:48 -0400 |
| commit | bd90127ad43d08c39e5bd592d03f7c0a4c683afe (patch) | |
| tree | c840851273e349cb0aee31cb5958acdf093c819a /guix/scripts/system.scm | |
| parent | 5f20553dee3fbc924b0cafb54ac215b0d3bf344c (diff) | |
| parent | 430505eba33b7bb59fa2d22e0f21ff317cbc320d (diff) | |
| download | gnu-guix-bd90127ad43d08c39e5bd592d03f7c0a4c683afe.tar gnu-guix-bd90127ad43d08c39e5bd592d03f7c0a4c683afe.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/system.scm')
| -rw-r--r-- | guix/scripts/system.scm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 45f598219d..5e2d226dfe 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -26,6 +26,7 @@ #:use-module (guix utils) #:use-module (guix monads) #:use-module (guix profiles) + #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (guix build utils) #:use-module (gnu build install) @@ -298,19 +299,6 @@ it atomically, and then run OS's activation script." ((disk-image) (system-disk-image os #:disk-image-size image-size)))) -(define* (maybe-build drvs - #:key dry-run? use-substitutes?) - "Show what will/would be built, and actually build DRVS, unless DRY-RUN? is -true." - (with-monad %store-monad - (>>= (show-what-to-build* drvs - #:dry-run? dry-run? - #:use-substitutes? use-substitutes?) - (lambda (_) - (if dry-run? - (return #f) - (built-derivations drvs)))))) - (define* (perform-action action os #:key grub? dry-run? use-substitutes? device target @@ -514,6 +502,13 @@ Build the operating system declared in FILE according to ACTION.\n")) (leave (_ "wrong number of arguments for action '~a'~%") action)) + (unless action + (format (current-error-port) + (_ "guix system: missing command name~%")) + (format (current-error-port) + (_ "Try 'guix system --help' for more information.~%")) + (exit 1)) + (case action ((build vm vm-image disk-image reconfigure) (unless (= count 1) |