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.

diff --git a/meson.build b/meson.build
index b53dfaa94c87f7a2ab79f7e48f1df13031278267..f97611c94218fd8bc50c1ddd312345898812cb54 100644 (file)
--- 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 9ce6f1c2acbe7248ae6f3ad09f91bd536c3c3860..d69273f6b30d31ad8f6dce5c2482647eb3b707df 100644 (file)
--- 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