diff --git a/nixos/mac-studio-sandbox.nix b/nixos/mac-studio-sandbox.nix index a19577cfda4c50cf7516a166aa862c289a4c724b..9098dc35799f540cf0f4d6251a744c32856c544d 100644 --- a/nixos/mac-studio-sandbox.nix +++ b/nixos/mac-studio-sandbox.nix @@ -49,15 +49,16 @@ in services.nfs.server = { enable = true; hostName = "10.0.0.1"; - extraNfsdConfig = '' - vers3 = n - udp = n - tcp = y - ''; exports = '' ${mountPoint} 10.0.0.222(rw,sync,fsid=0,no_subtree_check,all_squash,anonuid=${toString config.users.users.clo.uid},anongid=${toString config.users.groups.chloe.gid},insecure) ''; }; + services.nfs.settings.nfsd = { + vers3 = false; + "vers4.0" = true; + udp = false; + tcp = true; + }; systemd.services.nfs-mountd = { path = [ pkgs.gawk ]; diff --git a/nixos/tests/mac-studio-sandbox.nix b/nixos/tests/mac-studio-sandbox.nix index 78928393aa24fa1656e3cdbf2ef2bb1a0a516ef3..7f41529846c405ca0ab390a4b9e53aa7615284cd 100644 --- a/nixos/tests/mac-studio-sandbox.nix +++ b/nixos/tests/mac-studio-sandbox.nix @@ -64,7 +64,9 @@ pkgs.testers.runNixOSTest { assert server.succeed(f"cat {mountpoint}/retained") == "retained" server.wait_for_unit("nfs-server.service") server.succeed("exportfs -v") - assert "-3" in server.succeed("cat /proc/fs/nfsd/versions").split() + versions = server.succeed("cat /proc/fs/nfsd/versions").split() + print(f"Enabled NFS versions: {versions}") + assert "-3" in versions and "+4" in versions and "-4.0" not in versions with subtest("shared guard accepts the dataset bind and rejects a covering wrong mount"): server.succeed(f"mkdir -p /mnt/guard-bind /mnt/guard-wrong; mount --bind {mountpoint} /mnt/guard-bind") @@ -74,7 +76,7 @@ pkgs.testers.runNixOSTest { server.succeed("umount /mnt/guard-bind; umount /mnt/guard-bind; umount /mnt/guard-wrong") with subtest("NFS ordinary writes, fsync, rename, execute bits and case distinctions"): - client.succeed("mkdir -p /mnt/sandbox; timeout 30 mount -t nfs -o vers=4,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox") + client.succeed("mkdir -p /mnt/sandbox; timeout 30 mount -t nfs -o vers=4.0,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox") client.succeed(r"""python3 - <<'PY' from pathlib import Path import os @@ -139,7 +141,7 @@ pkgs.testers.runNixOSTest { assert server.succeed(f"cat {mountpoint}/wrong-sentinel") == "untouched" server.succeed(f"zfs unmount globe/wrong; zfs set mountpoint=none globe/wrong; zfs mount {dataset}") server.succeed("systemctl reset-failed; systemctl start mac-studio-sandbox.service nfs-server.service") - client.succeed("timeout 30 mount -t nfs -o vers=4,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox") + client.succeed("timeout 30 mount -t nfs -o vers=4.0,proto=tcp,hard,noatime 10.0.0.1:/ /mnt/sandbox") assert client.succeed("cat /mnt/sandbox/finished") == "synthetic native NFS bytes\n" client.succeed("timeout 30 umount /mnt/sandbox") server.succeed("systemctl stop nfs-server.service nfs-mountd.service; zpool status -x")