diff options
author | Colin Walters <walters@verbum.org> | 2010-09-03 14:46:53 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2010-09-03 14:46:53 -0400 |
commit | 87d324c3434b03214d82c6fc30cb7a6a754318ab (patch) | |
tree | fb8a3ebed2a8e2b20cb98001accb58195b51c4ed /bus | |
parent | 45d53565bc13678d6aa5edec1d4efb5bf8a64e0b (diff) | |
parent | 8f2eb502a3c491b64012adb3ea8220a9952ce3c6 (diff) | |
download | dbus-87d324c3434b03214d82c6fc30cb7a6a754318ab.tar.gz |
Merge branch 'dbus-1.2'
Conflicts:
dbus/dbus-sysdeps-unix.c
Diffstat (limited to 'bus')
-rwxr-xr-x | bus/messagebus.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bus/messagebus.in b/bus/messagebus.in index 1f1004b1..3e2ee07a 100755 --- a/bus/messagebus.in +++ b/bus/messagebus.in @@ -68,7 +68,7 @@ case "$1" in stop ;; status) - status $processname + status $servicename RETVAL=$? ;; restart) |