diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-16 15:34:57 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-10-17 19:31:50 +0200 |
| commit | afa6206583dfbc93e29981cb5d713841e4ca2865 (patch) | |
| tree | 6b149cca97e24645603a8cbaa3135aa2f9a98022 /units | |
| parent | d85515edcf9700dc068201ab9f7103f04f3b25b2 (diff) | |
| download | systemd-afa6206583dfbc93e29981cb5d713841e4ca2865.tar.gz | |
units: use SuccessAction=poweroff-force in systemd-poweroff.service
Explicit systemctl calls remain in systemd-halt.service and the system
systemd-exit.service. To convert systemd-halt, we'd need to add
SuccessAction=halt-force. Halting doesn't make much sense, so let's just
leave that is. systemd-exit.service will be converted in the next commit.
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 2 | ||||
| -rw-r--r-- | units/systemd-poweroff.service (renamed from units/systemd-poweroff.service.in) | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/units/meson.build b/units/meson.build index 3785e15dec..9d372c78a8 100644 --- a/units/meson.build +++ b/units/meson.build @@ -97,6 +97,7 @@ units = [ 'sockets.target.wants/'], ['systemd-networkd.socket', 'ENABLE_NETWORKD', join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], + ['systemd-poweroff.service', ''], ['systemd-reboot.service', ''], ['systemd-rfkill.socket', 'ENABLE_RFKILL'], ['systemd-tmpfiles-clean.timer', '', @@ -179,7 +180,6 @@ in_units = [ ['systemd-nspawn@.service', ''], ['systemd-portabled.service', 'ENABLE_PORTABLED', 'dbus-org.freedesktop.portable1.service'], - ['systemd-poweroff.service', ''], ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', 'sysinit.target.wants/'], diff --git a/units/systemd-poweroff.service.in b/units/systemd-poweroff.service index e9fd655508..8d1d54389b 100644 --- a/units/systemd-poweroff.service.in +++ b/units/systemd-poweroff.service @@ -13,7 +13,4 @@ Documentation=man:systemd-halt.service(8) DefaultDependencies=no Requires=shutdown.target umount.target final.target After=shutdown.target umount.target final.target - -[Service] -Type=oneshot -ExecStart=@SYSTEMCTL@ --force poweroff +SuccessAction=poweroff-force |