diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-16 15:09:11 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-17 19:31:50 +0200 |
commit | 631c9b7bf2dab5065d753a7b1cfaff5b100b3c90 (patch) | |
tree | 86024422aaa910465fb73e8d34813da424778afe | |
parent | core: limit service-watchdogs=no to actual "watchdog" commands (diff) | |
download | systemd-631c9b7bf2dab5065d753a7b1cfaff5b100b3c90.tar.xz systemd-631c9b7bf2dab5065d753a7b1cfaff5b100b3c90.zip |
units: use SuccessAction=exit-force in systemd-exit.service
Fixes #10414.
v2:
- rename .service.in to .service
- rename 'exit' to 'exit-force'
-rw-r--r-- | units/user/meson.build | 2 | ||||
-rw-r--r-- | units/user/systemd-exit.service (renamed from units/user/systemd-exit.service.in) | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/units/user/meson.build b/units/user/meson.build index b1c2e95597..36341a42f5 100644 --- a/units/user/meson.build +++ b/units/user/meson.build @@ -14,6 +14,7 @@ units = [ 'sockets.target', 'sound.target', 'timers.target', + 'systemd-exit.service', 'systemd-tmpfiles-clean.timer', ] @@ -23,7 +24,6 @@ foreach file : units endforeach in_units = [ - 'systemd-exit.service', 'systemd-tmpfiles-clean.service', 'systemd-tmpfiles-setup.service', ] diff --git a/units/user/systemd-exit.service.in b/units/user/systemd-exit.service index d69273f6b3..1d3b61e3ab 100644 --- a/units/user/systemd-exit.service.in +++ b/units/user/systemd-exit.service @@ -13,7 +13,4 @@ Documentation=man:systemd.special(7) DefaultDependencies=no Requires=shutdown.target After=shutdown.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --user --force exit +SuccessAction=exit-force |