public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VM tests: veryloose -> cache=loose

Browse Source
This commit is contained in:
Eelco Dolstra 2017-02-13 12:18:10 +01:00
parent 4af79a7331
commit a4ec1841da
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/virtualisation/qemu-vm.nix
View File

@ -440,7 +440,7 @@ in
${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
{ device = "store"; { device = "store";
fsType = "9p"; fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
neededForBoot = true; neededForBoot = true;
}; };
"/tmp" = mkIf config.boot.tmpOnTmpfs "/tmp" = mkIf config.boot.tmpOnTmpfs
@ -453,7 +453,7 @@ in
"/tmp/xchg" = "/tmp/xchg" =
{ device = "xchg"; { device = "xchg";
fsType = "9p"; fsType = "9p";
options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
neededForBoot = true; neededForBoot = true;
}; };
"/tmp/shared" = "/tmp/shared" =

4
pkgs/build-support/vm/default.nix
View File

@ -130,7 +130,7 @@ rec {
echo "mounting Nix store..." echo "mounting Nix store..."
mkdir -p /fs${storeDir} mkdir -p /fs${storeDir}
mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose
mkdir -p /fs/tmp /fs/run /fs/var mkdir -p /fs/tmp /fs/run /fs/var
mount -t tmpfs -o "mode=1777" none /fs/tmp mount -t tmpfs -o "mode=1777" none /fs/tmp
@ -139,7 +139,7 @@ rec {
echo "mounting host's temporary directory..." echo "mounting host's temporary directory..."
mkdir -p /fs/tmp/xchg mkdir -p /fs/tmp/xchg
mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose
mkdir -p /fs/proc mkdir -p /fs/proc
mount -t proc none /fs/proc mount -t proc none /fs/proc