pyrox.dev / nixpkgs
lol
fork atom

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

nixos/nfs: allow setting the path to krb5.keytab

authored by Jörg Thalheim and committed by GitHub 743848bb 56574e60

+7 -1
unified split
+6
nixos/modules/tasks/filesystems/nfs.nix
··· 85 enable = mkDefault false; 86 }; 87 88 systemd.services.rpc-gssd = 89 { restartTriggers = [ nfsConfFile ]; 90 }; 91 92 systemd.services.rpc-statd =
··· 85 enable = mkDefault false; 86 }; 87 88 + systemd.services.auth-rpcgss-module = 89 + { 90 + unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ]; 91 + }; 92 + 93 systemd.services.rpc-gssd = 94 { restartTriggers = [ nfsConfFile ]; 95 + unitConfig.ConditionPathExists = [ "" "/etc/krb5.keytab" ]; 96 }; 97 98 systemd.services.rpc-statd =
+1 -1
pkgs/os-specific/linux/nfs-utils/default.nix
··· 39 sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd 40 41 configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags" 42 - 43 substituteInPlace systemd/nfs-utils.service \ 44 --replace "/bin/true" "${coreutils}/bin/true" 45
··· 39 sed -i "s,^PATH=.*,PATH=$out/bin:${statdPath}," utils/statd/start-statd 40 41 configureFlags="--with-start-statd=$out/bin/start-statd $configureFlags" 42 + 43 substituteInPlace systemd/nfs-utils.service \ 44 --replace "/bin/true" "${coreutils}/bin/true" 45