diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-07-28 14:04:51 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-07-28 14:04:51 +0000 |
| commit | afb40bc38f5ce84a6d83b089c60db83ca50c5658 (patch) | |
| tree | c71fcbaf994c012ba10be0fbe32ef5a1b6edcf66 | |
| parent | 4402c43e17e5dac6f500f1e70b1ed21737abfd36 (diff) | |
2003-07-28 Havoc Pennington <hp@redhat.com>
* bus/messagebus.in: fix to avoid processname/servicename
confusion, from Michael Kearey
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=100965
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | bus/messagebus.in | 20 |
2 files changed, 18 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2003-07-28 Havoc Pennington <hp@redhat.com> + + * bus/messagebus.in: fix to avoid processname/servicename + confusion, from Michael Kearey + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=100965 + 2003-07-23 Havoc Pennington <hp@pobox.com> * dbus/dbus-message.c (dbus_message_iter_get_named): diff --git a/bus/messagebus.in b/bus/messagebus.in index e4a16967..7a358764 100755 --- a/bus/messagebus.in +++ b/bus/messagebus.in @@ -16,27 +16,31 @@ # Source function library. . @EXPANDED_SYSCONFDIR@/rc.d/init.d/functions +# so we can rearrange this easily +processname=dbus-daemon-1 +servicename=messagebus + RETVAL=0 start() { echo -n $"Starting system message bus: " - daemon --check messagebus dbus-daemon-1 --system + daemon --check $servicename $processname --system RETVAL=$? echo - [ $RETVAL -eq 0 ] && touch @EXPANDED_LOCALSTATEDIR@/lock/subsys/messagebus + [ $RETVAL -eq 0 ] && touch @EXPANDED_LOCALSTATEDIR@/lock/subsys/$servicename } stop() { echo -n $"Stopping system message bus: " - ## we don't want to kill all the per-user dbus-daemon-1, we want + ## we don't want to kill all the per-user $processname, we want ## to use the pid file *only*; because we use the fake nonexistent - ## program name "messagebus" that should be safe-ish - killproc messagebus -TERM + ## program name "$servicename" that should be safe-ish + killproc $servicename -TERM RETVAL=$? echo if [ $RETVAL -eq 0 ]; then - rm -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/messagebus + rm -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/$servicename rm -f @DBUS_SYSTEM_PID_FILE@ fi } @@ -50,7 +54,7 @@ case "$1" in stop ;; status) - status messagebus + status $processname RETVAL=$? ;; restart) @@ -58,7 +62,7 @@ case "$1" in start ;; condrestart) - if [ -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/messagebus ]; then + if [ -f @EXPANDED_LOCALSTATEDIR@/lock/subsys/$servicename ]; then stop start fi |