From 4fc96187b926f757980d433d417cafe74dcf6b12 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Jun 2014 20:52:38 +0200
Subject: 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.
---
 gnu/system/vm.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'gnu/system/vm.scm')

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")
-- 
cgit v1.2.3