units: rework systemd-exit.service to terminate systemd via signal rather than bus

This should make session termination more reliable, as D-Bus doesn't
have to be around anymore for this to succeed.

diff --git a/Makefile.am b/Makefile.am
index 8e88c42c8f3c5a20dbb2e37fdee902d4cc941740..e1eb03408d0e8e588c647be4baeb8d5faac1dffe 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3613,6 +3613,7 @@ SED_PROCESS = \
                -e 's,@rootprefix\@,$(rootprefix),g' \
                -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
                -e 's,@sushell\@,$(sushell),g' \
+               -e 's,@KILL\@,$(KILL),g' \
                -e 's,@QUOTAON\@,$(QUOTAON),g' \
                -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
                -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \

diff --git a/configure.ac b/configure.ac
index 62e83beb1f334554655368ef7213b1c3a4f4a1e6..a16e7ea286352abe45297f8d23cd9bb60ec323da 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,10 +64,12 @@ AC_PROG_GCC_TRADITIONAL
 AC_PATH_PROG([M4], [m4])
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
-AC_PATH_PROG([QUOTAON], [quotaon], [/sbin/quotaon])
-AC_PATH_PROG([QUOTACHECK], [quotacheck], [/sbin/quotacheck])
+AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon])
+AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck])
 
-AC_PATH_PROG([SETCAP], [setcap], [/sbin/setcap])
+AC_PATH_PROG([SETCAP], [setcap], [/usr/sbin/setcap])
+
+AC_PATH_PROG([KILL], [kill], [/usr/bin/cap])
 
 # gtkdocize greps for '^GTK_DOC_CHECK', so it needs to be on its own line
 m4_ifdef([GTK_DOC_CHECK], [

diff --git a/units/user/systemd-exit.service.in b/units/user/systemd-exit.service.in
index a114f6c1bee2a942aa48639b7e04222df3fbe550..95bd6b116182c7d7f97f766d6c5073c07f4fd4ae 100644 (file)
--- a/units/user/systemd-exit.service.in
+++ b/units/user/systemd-exit.service.in
@@ -14,4 +14,4 @@ After=shutdown.target
 
 [Service]
 Type=oneshot
-ExecStart=@SYSTEMCTL@ --user --force exit
+ExecStart=@KILL@ -s RTMAX-6 $MANAGERPID