diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-06-30 20:52:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-07-01 09:23:32 +0200 |
| commit | 4fc96187b926f757980d433d417cafe74dcf6b12 (patch) | |
| tree | 29cd211119196e7acb71817cd0bc83de14566d52 | |
| parent | 24e0160a4a319a849a9d48da52883a1979df76f9 (diff) | |
| download | patches-4fc96187b926f757980d433d417cafe74dcf6b12.tar patches-4fc96187b926f757980d433d417cafe74dcf6b12.tar.gz | |
linux-initrd: Disable QEMU networking by default.
* gnu/system/linux-initrd.scm (qemu-initrd): Remove default value for
#:qemu-networking?.
* gnu/system/vm.scm (expression->derivation-in-linux-vm): Pass
#:qemu-networking? #t.
(system-disk-image): Remove #:qemu-networking? #f.
(virtualized-operating-system): Pass #:qemu-networking? #t.
| -rw-r--r-- | gnu/system/linux-initrd.scm | 2 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm index 5e3263e37c..3edbf5046b 100644 --- a/gnu/system/linux-initrd.scm +++ b/gnu/system/linux-initrd.scm @@ -203,7 +203,7 @@ initrd code." (define* (qemu-initrd file-systems #:key - (qemu-networking? #t) + qemu-networking? virtio? volatile-root? guile-modules-in-chroot?) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 61b10f18df..4796566612 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -155,6 +155,7 @@ made available under the /xchg CIFS share." (return initrd) (qemu-initrd %linux-vm-file-systems #:virtio? #t + #:qemu-networking? #t #:guile-modules-in-chroot? #t)))) (define builder @@ -287,8 +288,7 @@ to USB sticks meant to be read-only." ;; Since this is meant to be used on real hardware, don't set up ;; QEMU networking. (initrd (cut qemu-initrd <> - #:volatile-root? volatile? - #:qemu-networking? #f)) + #:volatile-root? volatile?)) ;; Force our own root file system. (file-systems (cons (file-system @@ -352,7 +352,8 @@ environment with the store shared with the host." (operating-system (inherit os) (initrd (cut qemu-initrd <> #:volatile-root? #t - #:virtio? #t)) + #:virtio? #t + #:qemu-networking? #t)) (file-systems (cons* (file-system (mount-point "/") (device "/dev/vda1") |