~ruther/guix-local

4fc96187b926f757980d433d417cafe74dcf6b12 — Ludovic Courtès 11 years ago 24e0160
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.
2 files changed, 5 insertions(+), 4 deletions(-)

M gnu/system/linux-initrd.scm
M gnu/system/vm.scm
M gnu/system/linux-initrd.scm => gnu/system/linux-initrd.scm +1 -1
@@ 203,7 203,7 @@ initrd code."

(define* (qemu-initrd file-systems
                      #:key
                      (qemu-networking? #t)
                      qemu-networking?
                      virtio?
                      volatile-root?
                      guile-modules-in-chroot?)

M gnu/system/vm.scm => gnu/system/vm.scm +4 -3
@@ 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")