diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-01-18 22:20:38 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-01-18 22:20:38 +0000 |
| commit | 2abdb13ebe737e39653b79fecd93477e156b9db1 (patch) | |
| tree | 6761a54d43d7cd4f6c767e12ae84ddde5463497d /tools | |
| parent | 8873c90f99303f9cc308f15f8d03e637911f5b9e (diff) | |
2005-01-18 Havoc Pennington <hp@redhat.com>
* rename dbus-daemon-1 to dbus-daemon throughout
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dbus-launch.1 | 6 | ||||
| -rw-r--r-- | tools/dbus-launch.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/dbus-launch.1 b/tools/dbus-launch.1 index 771dcb2c..33f0d239 100644 --- a/tools/dbus-launch.1 +++ b/tools/dbus-launch.1 @@ -11,7 +11,7 @@ dbus-launch \- Utility to start a message bus from a shell script .SH DESCRIPTION -The \fIdbus-launch\fP command is used to start \fIdbus-daemon-1\fP +The \fIdbus-launch\fP command is used to start \fIdbus-daemon\fP from a shell script. It would normally be called from a user's login scripts. Unlike the daemon itself, \fIdbus-launch\fP exits, so backticks or the $() construct can be used to read information from @@ -40,7 +40,7 @@ know which shell your script is written in. .PP See http://www.freedesktop.org/software/dbus/ for more information -about D-BUS. See also the man page for \fIdbus-daemon-1\fP. +about D-BUS. See also the man page for \fIdbus-daemon\fP. .PP Here is an example of how to use \fIdbus-launch\fP with an @@ -76,7 +76,7 @@ Choose \-\-csh-syntax or \-\-sh-syntax based on the SHELL environment variable. .TP .I "--config-file=FILENAME" Pass \-\-config-file=FILENAME to the bus daemon, instead of passing it -the \-\-session argument. See the man page for dbus-daemon-1 +the \-\-session argument. See the man page for dbus-daemon .TP .I "--csh-syntax" diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index 01d1a9f9..e24651a5 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -756,7 +756,7 @@ main (int argc, char **argv) verbose ("=== Bus exec process created\n"); /* Now we are the bus process (well, almost; - * dbus-daemon-1 itself forks again) + * dbus-daemon itself forks again) */ close (bus_pid_to_launcher_pipe[READ_END]); close (bus_address_to_launcher_pipe[READ_END]); @@ -771,8 +771,8 @@ main (int argc, char **argv) verbose ("Calling exec()\n"); - execlp ("dbus-daemon-1", - "dbus-daemon-1", + execlp ("dbus-daemon", + "dbus-daemon", "--fork", "--print-pid", write_pid_fd_as_string, "--print-address", write_address_fd_as_string, |