nix/2.home-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

services/ssh-agent: treat SIGTERM exit as clean

Browse source 
OpenSSH ssh-agent exits with status 2 when systemd stops it in
non-socket-activated mode.

Home Manager runs ssh-agent that way, so normal user-manager
shutdowns show up as unit failures.

Set SuccessExitStatus=2 for the Linux user service to match
upstream behavior. Startup failures and other unexpected exits
still fail the unit.
This commit is contained in:
Ihar Hrachyshka 2026-03-27 22:16:41 -04:00 • committed by Bruno BELANYI
parent 769e07ef8f
commit 5ed75a0312
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
modules/services/ssh-agent.nix
View file

@ -108,15 +108,18 @@ in
Description = "SSH authentication agent";
Documentation = "man:ssh-agent(1)";
};
Service.ExecStart = "${lib.getExe' cfg.package "ssh-agent"} -D -a %t/${cfg.socket}${
lib.optionalString (
cfg.defaultMaximumIdentityLifetime != null
) " -t ${toString cfg.defaultMaximumIdentityLifetime}"
}${
lib.optionalString (
cfg.pkcs11Whitelist != [ ]
) " -P '${lib.concatStringsSep "," cfg.pkcs11Whitelist}'"
}";
Service = {
ExecStart = "${lib.getExe' cfg.package "ssh-agent"} -D -a %t/${cfg.socket}${
lib.optionalString (
cfg.defaultMaximumIdentityLifetime != null
) " -t ${toString cfg.defaultMaximumIdentityLifetime}"
}${
lib.optionalString (
cfg.pkcs11Whitelist != [ ]
) " -P '${lib.concatStringsSep "," cfg.pkcs11Whitelist}'"
}";
SuccessExitStatus = 2;
};
};
launchd.agents.ssh-agent = {

1
tests/modules/services/ssh-agent/linux/basic-service-expected.service
View file

@ -3,6 +3,7 @@ WantedBy=default.target
[Service]
ExecStart=@openssh@/bin/ssh-agent -D -a %t/ssh-agent/socket
SuccessExitStatus=2
[Unit]
Description=SSH authentication agent

1
tests/modules/services/ssh-agent/linux/pkcs11-service-expected.service
View file

@ -3,6 +3,7 @@ WantedBy=default.target
[Service]
ExecStart=@openssh@/bin/ssh-agent -D -a %t/ssh-agent -P '/nix/store/*/lib,/usr/lib/libpkcs11.so,/usr/lib/other.so'
SuccessExitStatus=2
[Unit]
Description=SSH authentication agent

1
tests/modules/services/ssh-agent/linux/timeout-service-expected.service
View file

@ -3,6 +3,7 @@ WantedBy=default.target
[Service]
ExecStart=@openssh@/bin/ssh-agent -D -a %t/ssh-agent -t 1337
SuccessExitStatus=2
[Unit]
Description=SSH authentication agent