From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 27 Sep 2008 17:29:26 +0000 (+0000)
Subject: Run `dbus-uuidgen --ensure` before launching the dbus daemon.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=944d7ed38f2f914a1197cb13b7f7d23cd4bddca3;p=openwrt%2Fsvn-archive%2Farchive.git

Run `dbus-uuidgen --ensure` before launching the dbus daemon.


SVN-Revision: 12741
---

diff --git a/utils/dbus/files/dbus.init b/utils/dbus/files/dbus.init
index a8d53d5b9d..1c622fc554 100644
--- a/utils/dbus/files/dbus.init
+++ b/utils/dbus/files/dbus.init
@@ -1,5 +1,5 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2008 OpenWrt.org
 
 SSD=start-stop-daemon
 PIDF=/var/run/dbus.pid
@@ -8,8 +8,13 @@ ARGS=--system
 
 START=60
 start() {
+	if [ -x /usr/bin/dbus-uuidgen ]; then
+		mkdir -p /var/lib/dbus/
+		/usr/bin/dbus-uuidgen --ensure
+	fi
+
 	mkdir -p /var/run/dbus
-	$SSD -S -p $PIDF -q -x $PROG -- $ARGS 
+	$SSD -S -p $PIDF -q -x $PROG -- $ARGS
 }
 
 stop() {
@@ -17,6 +22,6 @@ stop() {
 }
 
 status() {
-        ps | grep -q "^ *$(cat $PIDF 2>/dev/null) *.*$PROG"
+	ps | grep -q "^ *$(cat $PIDF 2>/dev/null) *.*$PROG"
 }