summary refs log tree commit diff
path: root/gnu/system/vm.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-30 06:49:38 +0200
committerLudovic Courtès <ludo@gnu.org>2014-07-01 09:23:32 +0200
commit24e0160a4a319a849a9d48da52883a1979df76f9 (patch)
tree826b8d2793056e0529c13d538b1778c8a825b4e0 /gnu/system/vm.scm
parentcafc3f5ad76b534662ced753f7f2f07841da6bf4 (diff)
downloadguix-24e0160a4a319a849a9d48da52883a1979df76f9.tar.gz
linux-initrd: Make the virtio kernel modules optional.
* gnu/system/linux-initrd.scm (qemu-initrd): Add #:virtio? parameter.
  Use it.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass
  'qemu-initrd' #:virtio?.
  (virtualized-operating-system): Likewise.
Diffstat (limited to 'gnu/system/vm.scm')
-rw-r--r--gnu/system/vm.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 3c9c9c83e1..61b10f18df 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -154,6 +154,7 @@ made available under the /xchg CIFS share."
        (initrd       (if initrd                   ; use the default initrd?
                          (return initrd)
                          (qemu-initrd %linux-vm-file-systems
+                                      #:virtio? #t
                                       #:guile-modules-in-chroot? #t))))
 
     (define builder
@@ -349,7 +350,9 @@ of the GNU system as described by OS."
   "Return an operating system based on OS suitable for use in a virtualized
 environment with the store shared with the host."
   (operating-system (inherit os)
-    (initrd (cut qemu-initrd <> #:volatile-root? #t))
+    (initrd (cut qemu-initrd <>
+                 #:volatile-root? #t
+                 #:virtio? #t))
     (file-systems (cons* (file-system
                            (mount-point "/")
                            (device "/dev/vda1")