diff options
| author | Ruben Maher <r@rkm.id.au> | 2017-09-18 19:12:40 +0930 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2017-09-20 15:36:26 +0100 |
| commit | 98a2316166cbb4e9dc87e35d07dd520acb362ef2 (patch) | |
| tree | 0d287a56ac8ff102fb724a342c5ffa2d1cf8fae6 | |
| parent | eb2f321e11a48eb2041fe7aabd150ca98360d6a6 (diff) | |
| download | nixlib-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.
| -rw-r--r-- | nixos/modules/tasks/filesystems/nfs.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nfs-utils/default.nix | 2 |
2 files changed, 7 insertions, 1 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 = diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index d28cf44bd67a..294dde2a0a69 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -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" |