Merge pull request #29581 from eqyiel/fix-rpc-gssd

nixos/nfs: allow setting the path to krb5.keytab
This commit is contained in:
Jörg Thalheim 2017-09-22 01:41:10 +01:00 committed by GitHub
commit 743848bb46
2 changed files with 7 additions and 1 deletions

View file

@ -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 =

View file

@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd
configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags"
substituteInPlace systemd/nfs-utils.service \
--replace "/bin/true" "${coreutils}/bin/true"