diff options
| author | Domen Kožar <domen@dev.si> | 2016-01-11 11:29:16 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-01-11 11:29:16 +0100 |
| commit | 7b0613d51e072708b07de94a574ad7f0a128e450 (patch) | |
| tree | ecf7533fa010c6797c091536faea67baa17317cc | |
| parent | 0aa8b6fd1c05f986005c6da290f33bf5c743710c (diff) | |
| download | nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.tar nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.tar.gz nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.tar.bz2 nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.tar.lz nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.tar.xz nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.tar.zst nixlib-7b0613d51e072708b07de94a574ad7f0a128e450.zip | |
Revert "nixos/qemu-vm: Disable cache for $NIX_DISK_IMAGE"
This reverts commit 6353f580f90c0fdd2b418fa853a78ec508bda2a5. Unfortunately cache=none doesn't work with all filesystem options. Hydra tests error out with: file system may not support O_DIRECT See http://hydra.nixos.org/build/30323625/
| -rw-r--r-- | nixos/modules/virtualisation/qemu-vm.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 5c4686044430..82b58aa67a3d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -77,14 +77,14 @@ let -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ ${if cfg.useBootLoader then '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \ ${if cfg.useEFIBoot then '' -pflash $TMPDIR/bios.bin \ '' else '' ''} '' else '' - -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=none,werror=report \ + -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \ -kernel ${config.system.build.toplevel}/kernel \ -initrd ${config.system.build.toplevel}/initrd \ -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo} ${kernelConsole} $QEMU_KERNEL_PARAMS" \ |