pidfiles are evil

init.d/dbus

@@ -1,8 +1,8 @@
 #!/usr/bin/env watchman
 
+service_respawn=true
 service_command='/usr/bin/dbus-daemon'
-service_args='--system'
-service_pidfile='/run/dbus/pid'
+service_args='--system --nofork'
 
 start_pre() {
 	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
@@ -13,8 +13,3 @@ start() {
 	start_pre
 	watchman.start
 }
-
-stop() {
-	[[ -e "$service_pidfile" ]] && { rm "$service_pidfile"; }
-	watchman.stop
-}