summary refs log tree commit diff
path: root/nixos/modules/tasks/filesystems/nfs.nix
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-09-10 21:22:01 +0200
committerVladimír Čunát <v@cunat.cz>2020-09-10 21:31:35 +0200
commit538e558f48d111f46c86489eed87aff2791c0226 (patch)
treedacf3370755f4531a8181c255a8badf77ed08fb5 /nixos/modules/tasks/filesystems/nfs.nix
parentee55841b22aa6ac5454f27d1a9be71afe2b70fc7 (diff)
downloadnixpkgs-538e558f48d111f46c86489eed87aff2791c0226.tar
nixpkgs-538e558f48d111f46c86489eed87aff2791c0226.tar.gz
nixpkgs-538e558f48d111f46c86489eed87aff2791c0226.tar.bz2
nixpkgs-538e558f48d111f46c86489eed87aff2791c0226.tar.lz
nixpkgs-538e558f48d111f46c86489eed87aff2791c0226.tar.xz
nixpkgs-538e558f48d111f46c86489eed87aff2791c0226.tar.zst
nixpkgs-538e558f48d111f46c86489eed87aff2791c0226.zip
Revert "Merge #96844: nixos/nfsd: run rpc-statd as a normal user"
This reverts commit 42eebd7adef51b36c597753b3aaf6347864d176e, reversing
changes made to b169bfc9e2c981a46680c53343258d90be6f6d9f.

This breaks nfs3.simple test and even current PR #97656 wouldn't fix it.
Therefore let's revert for now to unblock the channels.
Diffstat (limited to 'nixos/modules/tasks/filesystems/nfs.nix')
-rw-r--r--nixos/modules/tasks/filesystems/nfs.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 67e5aa0bd58..ddcc0ed8f5a 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -101,6 +101,13 @@ in
       };
 
     systemd.services.rpc-statd =
-      { restartTriggers = [ nfsConfFile ]; };
+      { restartTriggers = [ nfsConfFile ];
+
+        preStart =
+          ''
+            mkdir -p /var/lib/nfs/{sm,sm.bak}
+          '';
+      };
+
   };
 }