packages: dbus/messagebus.upstart - no longer workaround for hald, cleanups

[glen]

Author: glen                         Date: Sun Oct  9 18:35:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- no longer workaround for hald, cleanups

---- Files affected:
packages/dbus:
   messagebus.upstart (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/dbus/messagebus.upstart
diff -u packages/dbus/messagebus.upstart:1.7 packages/dbus/messagebus.upstart:1.8
--- packages/dbus/messagebus.upstart:1.7	Sun Aug 14 13:29:05 2011
+++ packages/dbus/messagebus.upstart	Sun Oct  9 20:35:03 2011
@@ -1,28 +1,28 @@
-description "The D-BUS systemwide message bus"
+# dbus - D-Bus system message bus
+#
+# The D-Bus system message bus allows system daemons and user applications
+# to communicate.
+
+description "D-Bus system message bus"
 
 start on pld.sysinit-done
 stop on pld.shutdown-started
 
+expect fork
+respawn
+
 pre-start script
 	if modinfo capability >/dev/null 2>&1; then
 		modprobe -s capability
 	fi
-	dbus-uuidgen --ensure
+	exec dbus-uuidgen --ensure
 end script
 
-respawn
-expect fork
 exec /usr/bin/dbus-daemon --system --fork
 
-post-start script
-	# ask Upstart to reconnect to the bus
-	kill -USR1 1
-	# lockfile for hald
-	touch /var/lock/subsys/messagebus || :
-end script
+# ask Upstart to reconnect to the bus
+post-start exec kill -USR1 1
 
 post-stop script
 	rm -f /var/run/dbus.pid || :
-	# lockfile for hald
-	rm -f /var/lock/subsys/messagebus || :
 end script
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dbus/messagebus.upstart?r1=1.7&r2=1.8&f=u