diff options
author | Filipe Brandenburger <filbranden@google.com> | 2018-04-04 02:14:37 -0700 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-04-04 11:14:37 +0200 |
commit | add384dd4d2b96db6ace5ad9c52b1dd7553ebec2 (patch) | |
tree | 68b04884669547ba3449ca5f63dbf44c05c428ce | |
parent | 709e86f18f895496457466e3d4c6f6853c7ba8ec (diff) | |
download | systemd-add384dd4d2b96db6ace5ad9c52b1dd7553ebec2.tar.gz |
units: use `systemctl exit` to kill the user manager (#8648)
Use `systemctl --user --force exit` to implement the systemd-exit
user service.
This removes our dependence on an external `kill` binary and the
concerns about whether they recognize SIGRTMIN+n by name or what their
interpretation of SIGRTMIN is.
Tested: `systemctl --user start systemd-exit.service` kills the
`systemd --user` instance for my user.
-rw-r--r-- | meson.build | 1 | ||||
-rw-r--r-- | units/user/systemd-exit.service.in | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meson.build b/meson.build index b53dfaa94c..f97611c942 100644 --- a/meson.build +++ b/meson.build @@ -563,7 +563,6 @@ splash_bmp = files('test/splash.bmp') # /usr/sbin, /sbin, and fall back to the default from middle column. progs = [['quotaon', '/usr/sbin/quotaon' ], ['quotacheck', '/usr/sbin/quotacheck' ], - ['kill', '/usr/bin/kill' ], ['kmod', '/usr/bin/kmod' ], ['kexec', '/usr/sbin/kexec' ], ['sulogin', '/usr/sbin/sulogin' ], diff --git a/units/user/systemd-exit.service.in b/units/user/systemd-exit.service.in index 9ce6f1c2ac..d69273f6b3 100644 --- a/units/user/systemd-exit.service.in +++ b/units/user/systemd-exit.service.in @@ -16,4 +16,4 @@ After=shutdown.target [Service] Type=oneshot -ExecStart=@KILL@ -s 58 $MANAGERPID +ExecStart=@SYSTEMCTL@ --user --force exit |