summary refs log tree commit diff
path: root/nixos/modules/tasks
diff options
context:
space:
mode:
authorRuben Maher <r@rkm.id.au>2017-09-18 19:12:40 +0930
committerJörg Thalheim <joerg@thalheim.io>2017-09-20 15:36:26 +0100
commit98a2316166cbb4e9dc87e35d07dd520acb362ef2 (patch)
tree0d287a56ac8ff102fb724a342c5ffa2d1cf8fae6 /nixos/modules/tasks
parenteb2f321e11a48eb2041fe7aabd150ca98360d6a6 (diff)
downloadnixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.tar
nixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.tar.gz
nixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.tar.bz2
nixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.tar.lz
nixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.tar.xz
nixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.tar.zst
nixlib-98a2316166cbb4e9dc87e35d07dd520acb362ef2.zip
nfs-utils: set /etc/krb5.keytab as default path for rpc-gssd
Currently the `rpc-gssd.service` has a `ConditionPathExists` clause that can
never be met, because it's looking for stateful data inside `/nix/store`.

`auth-rpcgss-module.service` also only starts if this file exists.

Fixes NixOS/nixpkgs#29509.
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r--nixos/modules/tasks/filesystems/nfs.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 73cf18384bd4..d3a558738f4b 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -85,8 +85,14 @@ in
         enable = mkDefault false;
       };
 
+    systemd.services.auth-rpcgss-module =
+      {
+        unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ];
+      };
+
     systemd.services.rpc-gssd =
       { restartTriggers = [ nfsConfFile ];
+        unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ];
       };
 
     systemd.services.rpc-statd =