summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorKevin Cox <kevincox@kevincox.ca>2020-11-11 07:29:14 -0500
committerGitHub <noreply@github.com>2020-11-11 07:29:14 -0500
commitdce7cc111ae616a51bb0de800944520bdf9bad7a (patch)
tree70cd1f42e30b894152e534c8fe16625dad4da6be /nixos
parent5dee9b5699d1b9f591fe7f94c4e481d8ecef49c5 (diff)
parenta7de454a762cd6bda49a33c8531a553d67bce231 (diff)
downloadnixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.tar
nixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.tar.gz
nixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.tar.bz2
nixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.tar.lz
nixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.tar.xz
nixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.tar.zst
nixpkgs-dce7cc111ae616a51bb0de800944520bdf9bad7a.zip
Merge pull request #96912 from atlaua/aranea/qemu-vm-kernel-config
nixos/qemu-vm: Fix and update system.requiredKernelConfig entries
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/qemu-vm.nix7
1 files changed, 5 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 191d7c758c0..33da920e94c 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -744,16 +744,19 @@ in
         (isEnabled "VIRTIO_PCI")
         (isEnabled "VIRTIO_NET")
         (isEnabled "EXT4_FS")
+        (isEnabled "NET_9P_VIRTIO")
+        (isEnabled "9P_FS")
         (isYes "BLK_DEV")
         (isYes "PCI")
-        (isYes "EXPERIMENTAL")
         (isYes "NETDEVICES")
         (isYes "NET_CORE")
         (isYes "INET")
         (isYes "NETWORK_FILESYSTEMS")
-      ] ++ optional (!cfg.graphics) [
+      ] ++ optionals (!cfg.graphics) [
         (isYes "SERIAL_8250_CONSOLE")
         (isYes "SERIAL_8250")
+      ] ++ optionals (cfg.writableStore) [
+        (isEnabled "OVERLAY_FS")
       ];
 
   };