nixosTests.nfs4.{simple,kerberos}: use a nonzero fsid

TUM-DSE · Nov 12, 2023 · 968de63 · 968de63
1 parent f74153e
commit 968de63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/nixos/tests/nfs/kerberos.nix b/nixos/tests/nfs/kerberos.nix
@@ -40,7 +40,7 @@ in
 
         virtualisation.fileSystems =
           { "/data" = {
-              device  = "server.nfs.test:/";
+              device  = "server.nfs.test:/data";
               fsType  = "nfs";
               options = [ "nfsvers=4" "sec=krb5p" "noauto" ];
             };
@@ -71,7 +71,7 @@ in
         services.nfs.server.createMountPoints = true;
         services.nfs.server.exports =
           ''
-            /data *(rw,no_root_squash,fsid=0,sec=krb5p)
+            /data *(rw,no_root_squash,fsid=1,sec=krb5p)
           '';
       };
   };

diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix
@@ -6,8 +6,8 @@ let
     { pkgs, ... }:
     { virtualisation.fileSystems =
         { "/data" =
-           { # nfs4 exports the export with fsid=0 as a virtual root directory
-             device = if (version == 4) then "server:/" else "server:/data";
+           {
+             device = "server:/data";
              fsType = "nfs";
              options = [ "vers=${toString version}" ];
            };
@@ -32,7 +32,7 @@ in
         { services.nfs.server.enable = true;
           services.nfs.server.exports =
             ''
-              /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0)
+              /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=1)
             '';
           services.nfs.server.createMountPoints = true;
           networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed