public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/tasks/filesystems/nfs.nix
View File

@ -85,8 +85,14 @@ in
enable = mkDefault false; enable = mkDefault false;
}; };
systemd.services.auth-rpcgss-module =
{
unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ];
};
systemd.services.rpc-gssd = systemd.services.rpc-gssd =
{ restartTriggers = [ nfsConfFile ]; { restartTriggers = [ nfsConfFile ];
unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ];
}; };
systemd.services.rpc-statd = systemd.services.rpc-statd =

2
pkgs/os-specific/linux/nfs-utils/default.nix
View File

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