Merge branch 'version-0.13.0'

This commit is contained in:
Marius Bakke 2017-05-22 18:25:01 +02:00
commit fd3782d13b
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
7 changed files with 793 additions and 11 deletions

View file

@ -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