diff options
| author | Leo Famulari <leo@famulari.name> | 2018-03-06 13:39:12 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2018-03-06 13:39:12 -0500 |
| commit | 613ef763a52d7825f062eb7b58354504b64d2869 (patch) | |
| tree | bee086914ed97aab1eaba25c325268e33e57c358 /gnu/system/vm.scm | |
| parent | 86990eeda2a85acd3640059c0b681f1eddbacba0 (diff) | |
| parent | 8a325748fb8c3709beb2c26966a3e3c86831f95e (diff) | |
| download | guix-613ef763a52d7825f062eb7b58354504b64d2869.tar guix-613ef763a52d7825f062eb7b58354504b64d2869.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system/vm.scm')
| -rw-r--r-- | gnu/system/vm.scm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 345cecedd8..91ff32ce9a 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -143,7 +143,7 @@ made available under the /xchg CIFS share." (return initrd) (base-initrd %linux-vm-file-systems #:linux linux - #:virtio? #t + #:linux-modules %base-initrd-modules #:qemu-networking? #t)))) (define builder @@ -512,12 +512,7 @@ of the GNU system as described by OS." (let ((os (operating-system (inherit os) - ;; Use an initrd with the whole QEMU shebang. - (initrd (lambda (file-systems . rest) - (apply (operating-system-initrd os) - file-systems - #:virtio? #t - rest))) + ;; Assume we have an initrd with the whole QEMU shebang. ;; Force our own root file system. Refer to it by UUID so that ;; it works regardless of how the image is used ("qemu -hda", @@ -614,7 +609,6 @@ environment with the store shared with the host. MAPPINGS is a list of (apply (operating-system-initrd os) file-systems #:volatile-root? #t - #:virtio? #t rest))) ;; Disable swap. |