01/03: guix system: Reduce size of image produced for 'vm' action.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 4c0416ae1709e08c311d32af4823fac9d73364ee
Author: Ludovic Courtès <address@hidden>
Date:   Thu Apr 28 23:04:52 2016 +0200

    guix system: Reduce size of image produced for 'vm' action.
    
    This reduces the size of the image produced by 'guix system vm' from
    26Â MiB to 9Â MiB.
    
    * gnu/system/vm.scm (system-qemu-image/shared-store):
    (system-qemu-image/shared-store-script): Change the default
    value of #:disk-image-size to 30 MiB when not FULL-BOOT?.
    * guix/scripts/system.scm (system-derivation-for-action): Likewise for
    the 'vm' action.
---
 gnu/system/vm.scm       |    4 ++--
 guix/scripts/system.scm |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 58a476a..2fbef6a 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -425,7 +425,7 @@ environment with the store shared with the host.  MAPPINGS 
is a list of
           os
           #:key
           full-boot?
-          (disk-image-size (* (if full-boot? 500 15) (expt 2 20))))
+          (disk-image-size (* (if full-boot? 500 30) (expt 2 20))))
   "Return a derivation that builds a QEMU image of OS that shares its store
 with the host.
 
@@ -480,7 +480,7 @@ with '-virtfs' options for the host file systems listed in 
SHARED-FS."
                                                 (mappings '())
                                                 full-boot?
                                                 (disk-image-size
-                                                 (* (if full-boot? 500 15)
+                                                 (* (if full-boot? 500 30)
                                                     (expt 2 20))))
   "Return a derivation that builds a script to run a virtual machine image of
 OS that shares its store with the host.
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 566e7e8..e5d754a 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -477,7 +477,10 @@ PATTERN, a string.  When PATTERN is #f, display all the 
system generations."
     ((vm)
      (system-qemu-image/shared-store-script os
                                             #:full-boot? full-boot?
-                                            #:disk-image-size image-size
+                                            #:disk-image-size
+                                            (if full-boot?
+                                                image-size
+                                                (* 30 (expt 2 20)))
                                             #:mappings mappings))
     ((disk-image)
      (system-disk-image os #:disk-image-size image-size))))