diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 18:25:01 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-05-22 18:25:01 +0200 |
| commit | fd3782d13b8f2e835e9867c7abd92786a93e8ad6 (patch) | |
| tree | 6259124b015fcee06d6777f0a348da0fce34892f /guix/scripts/system.scm | |
| parent | 52d2a2be1fda52991a19519bc260f25655bfb1ab (diff) | |
| parent | 7c63fff6d0ba1dcd74e1a31c13b501d24d9c66f6 (diff) | |
Merge branch 'version-0.13.0'
Diffstat (limited to 'guix/scripts/system.scm')
| -rw-r--r-- | guix/scripts/system.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 5e4574f7c7..f71b1d71b8 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -575,7 +575,7 @@ PATTERN, a string. When PATTERN is #f, display all the system generations." #:disk-image-size (if full-boot? image-size - (* 30 (expt 2 20))) + (* 70 (expt 2 20))) #:mappings mappings)) ((disk-image) (system-disk-image os #:disk-image-size image-size)))) @@ -897,8 +897,10 @@ resulting from command-line parsing." ((shepherd-graph) (export-shepherd-graph os (current-output-port))) (else - (warn-about-old-distro #:suggested-command - "guix system reconfigure") + (unless (memq action '(build init)) + (warn-about-old-distro #:suggested-command + "guix system reconfigure")) + (perform-action action os #:dry-run? dry? #:derivations-only? (assoc-ref opts |