summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2017-09-22 01:41:10 +0100
committerGitHub <noreply@github.com>2017-09-22 01:41:10 +0100
commit743848bb46f8a9ae2d6e76dd4568a57025e4a799 (patch)
tree3ed8d14d30a3dacebea391c78bd3f81f3e26692d /nixos
parent56574e608706914f6b78557fc05e4705c7830945 (diff)
parent98a2316166cbb4e9dc87e35d07dd520acb362ef2 (diff)
downloadnixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.tar
nixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.tar.gz
nixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.tar.bz2
nixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.tar.lz
nixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.tar.xz
nixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.tar.zst
nixlib-743848bb46f8a9ae2d6e76dd4568a57025e4a799.zip
Merge pull request #29581 from eqyiel/fix-rpc-gssd
nixos/nfs: allow setting the path to krb5.keytab
Diffstat (limited to 'nixos')
-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 =