summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-04-28 23:04:52 +0200
committerLudovic Courtès <ludo@gnu.org>2016-04-29 18:05:44 +0200
commit4c0416ae1709e08c311d32af4823fac9d73364ee (patch)
tree5e25f6089cf808442e29b99049ef471167ef0bd9
parent99a0044614f5798dbbe48871dd7bfeb50b3db2f3 (diff)
downloadguix-4c0416ae1709e08c311d32af4823fac9d73364ee.tar.gz
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.
-rw-r--r--gnu/system/vm.scm4
-rw-r--r--guix/scripts/system.scm5
2 files changed, 6 insertions, 3 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 58a476a468..2fbef6a3fc 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 566e7e8768..e5d754a6fa 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))))