diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-07 16:58:01 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-06-15 13:10:16 +0100 |
| commit | fcc656d430f53ad62c25e41d7e7bd880cbb726a0 (patch) | |
| tree | 216e9c040be7e31ff72c36bbed2fd98db9b3d6c7 /doc | |
| parent | 1785b37e430efd912ef9dda0c728984a3eba4f09 (diff) | |
| download | dbus-fcc656d430f53ad62c25e41d7e7bd880cbb726a0.tar.gz | |
dbus-launch: add --exit-with-x11 option
This is more suitable for distributions' Xsession scripts: it verifies
that X is already available, and so never results in an attempt to poll
stdin.
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39197
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/dbus-launch.1 | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/doc/dbus-launch.1 b/doc/dbus-launch.1 index a7687cad..53d69f6d 100644 --- a/doc/dbus-launch.1 +++ b/doc/dbus-launch.1 @@ -7,7 +7,7 @@ dbus\-launch \- Utility to start a message bus from a shell script .SH SYNOPSIS .PP -.B dbus\-launch [\-\-version] [\-\-sh\-syntax] [\-\-csh\-syntax] [\-\-auto\-syntax] [\-\-exit\-with\-session] [\-\-autolaunch=MACHINEID] [\-\-config\-file=FILENAME] [PROGRAM] [ARGS...] +.B dbus\-launch [\-\-version] [\-\-sh\-syntax] [\-\-csh\-syntax] [\-\-auto\-syntax] [\-\-exit\-with\-session] [\-\-exit\-with\-x11] [\-\-autolaunch=MACHINEID] [\-\-config\-file=FILENAME] [PROGRAM] [ARGS...] .SH DESCRIPTION @@ -152,11 +152,25 @@ the \-\-session argument. See the man page for dbus\-daemon Emit csh compatible code to set up environment variables. .TP -.I "\-\-exit\-with\-session" -If this option is provided, a persistent "babysitter" process will be -created that watches stdin for HUP and tries to connect to the X -server. If this process gets a HUP on stdin or loses its X connection, -it kills the message bus daemon. +.I \-\-exit\-with\-x11 +If this option is provided, a persistent "babysitter" process will be +created, and will connect to the X server. If it cannot do so, launching +fails. If the "babysitter" process loses its X connection, +it kills the message bus daemon, disconnecting all of its clients (which +should exit in response). This avoids having leftover daemon +processes from a user X session, after the X session has ended. + +.TP +.I \-\-exit\-with\-session +If this option is provided, a persistent "babysitter" process will be +created, as if for +.BR \-\-exit\-with\-x11 . +If it cannot connect to the X server, it will monitor the terminal from which +.B dbus-launch +was started instead, and if it gets a HUP on stdin, the message bus daemon +will be killed. This option is not recommended, since it will consume input +from the terminal where it was started; it is mainly provided for +backwards compatibility. .TP .I "\-\-autolaunch=MACHINEID" |