Source Mage code commit list

["Arwed v. Merkatz" <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Arwed v. Merkatz <v.merkatz AT gmx.net>:

 utils/dbus/DETAILS                |    1 +
 utils/dbus/HISTORY                |    5 +++++
 utils/dbus/init.d/smgl-messagebus |   14 +++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)

New commits:
commit 87ccebba9a7b4e9922d81864a814df272c0416a6
Author: Arwed v. Merkatz <v.merkatz AT gmx.net>
Commit: Arwed v. Merkatz <v.merkatz AT gmx.net>

    dbus: fixed init script to work if there's a session bus running

diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index ca9427f..5296224 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,5 +1,6 @@
            SPELL=dbus
          VERSION=1.0.1
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://dbus.freedesktop.org/releases/dbus/$SOURCE
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 8cca706..c049a22 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,8 @@
+2006-12-03 Arwed v. Merkatz <v.merkatz AT gmx.net>
+       * DETAILS: patchlevel++
+       * init.d/smgl-messagebus: adjusted init script to work if a user
+         is running dbus a session bus
+
 2006-11-27 Treeve Jelbert <treeve AT pi.be>
        * DETAILS: version 1.0.1
 
diff --git a/utils/dbus/init.d/smgl-messagebus 
b/utils/dbus/init.d/smgl-messagebus
index 32e6c9f..073f159 100755
--- a/utils/dbus/init.d/smgl-messagebus
+++ b/utils/dbus/init.d/smgl-messagebus
@@ -10,9 +10,17 @@ PIDFILE=/var/run/dbus/pid
 start() {
   echo  "Starting system message bus..."
   mkdir -p  /var/run/dbus
-  loadproc $PROGRAM $ARGS
-  echo "Creating dbus machine uuid..."
-  /usr/bin/dbus-uuidgen --ensure
+  if test ! -f $PIDFILE; then
+    # don't use loadproc here, as that fails if some user is running
+    # a session bus
+    $PROGRAM $ARGS
+    evaluate_retval
+    echo "Creating dbus machine uuid..."
+    /usr/bin/dbus-uuidgen --ensure
+    evaluate_retval
+  else
+    print_status warning "$PIDFILE exists, messagebus is running or has 
crashed"
+  fi
 }
 
 stop() {