nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2014-06-30 20:52:38 +02:00
parent 24e0160a4a
commit 4fc96187b9
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/system/linux-initrd.scm
View File

@ -203,7 +203,7 @@ initrd code."
(define* (qemu-initrd file-systems (define* (qemu-initrd file-systems
#:key #:key
(qemu-networking? #t) qemu-networking?
virtio? virtio?
volatile-root? volatile-root?
guile-modules-in-chroot?) guile-modules-in-chroot?)

7
gnu/system/vm.scm
View File

@ -155,6 +155,7 @@ made available under the /xchg CIFS share."
(return initrd) (return initrd)
(qemu-initrd %linux-vm-file-systems (qemu-initrd %linux-vm-file-systems
#:virtio? #t #:virtio? #t
#:qemu-networking? #t
#:guile-modules-in-chroot? #t)))) #:guile-modules-in-chroot? #t))))
(define builder (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 ;; Since this is meant to be used on real hardware, don't set up
;; QEMU networking. ;; QEMU networking.
(initrd (cut qemu-initrd <> (initrd (cut qemu-initrd <>
#:volatile-root? volatile? #:volatile-root? volatile?))
#:qemu-networking? #f))
;; Force our own root file system. ;; Force our own root file system.
(file-systems (cons (file-system (file-systems (cons (file-system
@ -352,7 +352,8 @@ environment with the store shared with the host."
(operating-system (inherit os) (operating-system (inherit os)
(initrd (cut qemu-initrd <> (initrd (cut qemu-initrd <>
#:volatile-root? #t #:volatile-root? #t
#:virtio? #t)) #:virtio? #t
#:qemu-networking? #t))
(file-systems (cons* (file-system (file-systems (cons* (file-system
(mount-point "/") (mount-point "/")
(device "/dev/vda1") (device "/dev/vda1")