ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux-initrd: Disable QEMU networking by default.

Browse source 
* 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 @@ (define (file-system->spec fs)
(define* (qemu-initrd file-systems
#:key
(qemu-networking? #t)
qemu-networking?
virtio?
volatile-root?
guile-modules-in-chroot?)

7
gnu/system/vm.scm
View file

@ -155,6 +155,7 @@ (define* (expression->derivation-in-linux-vm name exp
(return initrd)
(qemu-initrd %linux-vm-file-systems
#:virtio? #t
#:qemu-networking? #t
#:guile-modules-in-chroot? #t))))
(define builder
@ -287,8 +288,7 @@ (define file-systems-to-keep
;; 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 @@ (define (virtualized-operating-system os)
(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")