summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-08-30 19:57:39 +0200
committerUli Baum <xeji@cat3.de>2018-08-30 19:57:39 +0200
commite0ca51c36741a4a14ebaf059d488d3cab3128cd9 (patch)
tree49266479830b1d490052ce7e1d9d232c6d228ab7 /nixos
parentc62bb34f7a99963e574032bb0b27c71ce4a6fd7d (diff)
downloadnixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.tar
nixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.tar.gz
nixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.tar.bz2
nixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.tar.lz
nixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.tar.xz
nixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.tar.zst
nixlib-e0ca51c36741a4a14ebaf059d488d3cab3128cd9.zip
nixos/tests/nfs: fix nfs4 client mount path
nfs4 exports from a virtual filesystem root,
so the client mount path differs from nfs3
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/nfs.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 1992f240e7b0..0ef44f1a4890 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -6,7 +6,8 @@ let
     { pkgs, ... }:
     { fileSystems = pkgs.lib.mkVMOverride
         [ { mountPoint = "/data";
-            device = "server:/data";
+            # nfs4 exports the export with fsid=0 as a virtual root directory
+            device = if (version == 4) then "server:/" else "server:/data";
             fsType = "nfs";
             options = [ "vers=${toString version}" ];
           }