diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-16 16:34:45 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-17 19:32:07 +0200 |
| commit | a400bd8c2a6285576edf8e2147e1d17aab129501 (patch) | |
| tree | 9ab9c6d40c7ce6543f9252f6466f7f09ad02e77f /units | |
| parent | afa6206583dfbc93e29981cb5d713841e4ca2865 (diff) | |
| download | systemd-a400bd8c2a6285576edf8e2147e1d17aab129501.tar.gz | |
units: allow and use SuccessAction=exit-force in system systemd-exit.service
C.f. 287419c119ef961db487a281162ab037eba70c61: 'systemctl exit 42' can be
used to set an exit value and pulls in exit.target, which pulls in systemd-exit.service,
which calls org.fdo.Manager.Exit, which calls method_exit(), which sets the objective
to MANAGER_EXIT. Allow the same to happen through SuccessAction=exit.
v2: update for 'exit' and 'exit-force'
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 2 | ||||
| -rw-r--r-- | units/systemd-exit.service (renamed from units/systemd-exit.service.in) | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/units/meson.build b/units/meson.build index 9d372c78a8..3cc86b3e92 100644 --- a/units/meson.build +++ b/units/meson.build @@ -85,6 +85,7 @@ units = [ 'multi-user.target.wants/'], ['systemd-coredump.socket', 'ENABLE_COREDUMP', 'sockets.target.wants/'], + ['systemd-exit.service', ''], ['systemd-initctl.socket', '', 'sockets.target.wants/'], ['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], @@ -135,7 +136,6 @@ in_units = [ ['systemd-binfmt.service', 'ENABLE_BINFMT', 'sysinit.target.wants/'], ['systemd-coredump@.service', 'ENABLE_COREDUMP'], - ['systemd-exit.service', ''], ['systemd-firstboot.service', 'ENABLE_FIRSTBOOT', 'sysinit.target.wants/'], ['systemd-fsck-root.service', ''], diff --git a/units/systemd-exit.service.in b/units/systemd-exit.service index 2fb6ebd767..6029b13a05 100644 --- a/units/systemd-exit.service.in +++ b/units/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@ --force exit +SuccessAction=exit |