diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-10-18 01:20:03 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-10-18 01:20:06 +0200 |
| commit | 86b2e20a5e5abf222fb81edcb5d58d012e35cbaa (patch) | |
| tree | b7bd5517f61134fdfda64557215b6a681cd796ac | |
| parent | 600b704eb0fe4b4fd2901017082254634823f02d (diff) | |
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.
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | units/user/systemd-exit.service.in | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 8e88c42c8f..e1eb03408d 100644 --- 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 62e83beb1f..a16e7ea286 100644 --- 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 a114f6c1be..95bd6b1161 100644 --- 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 |