diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-01 11:59:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-09-01 12:00:04 +0200 |
| commit | ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b (patch) | |
| tree | ceed33be35c9e79c96782577bda053e26a50e830 /nixos | |
| parent | 6cadec8906d8201ddb087a4051b0c272fd4ae51f (diff) | |
| download | nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.tar nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.tar.gz nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.tar.bz2 nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.tar.lz nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.tar.xz nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.tar.zst nixlib-ea7b5bb8b0462a01fc5288eb94dca0b0d779bd2b.zip | |
Fix NFSv4 test
http://hydra.nixos.org/build/25349071
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/network-filesystems/nfsd.nix | 5 | ||||
| -rw-r--r-- | nixos/tests/nfs.nix | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 33b7ec3d9f1c..f1838224098b 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -88,10 +88,7 @@ in environment.systemPackages = [ pkgs.nfs-utils ]; - environment.etc = singleton - { source = exports; - target = "exports"; - }; + environment.etc.exports.source = exports; boot.kernelModules = [ "nfsd" ]; diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index 963776dd2acf..24f6e0f2ed95 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -6,7 +6,7 @@ let { config, pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/data"; - device = "server:${if version == 4 then "/" else "/data"}"; + device = "server:/data"; fsType = "nfs"; options = "vers=${toString version}"; } |