From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 13 Aug 2009 13:51:07 +0000 (+0200)
Subject: Likewise on extras.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a2156e5309b79f7184491d2911c5c5f474af04b;p=ipfire-3.x.git

Likewise on extras.
---

diff --git a/src/initscripts/extras/haldaemon.conf b/src/initscripts/extras/haldaemon.conf
index d9c84644e..0ed3d7fae 100644
--- a/src/initscripts/extras/haldaemon.conf
+++ b/src/initscripts/extras/haldaemon.conf
@@ -4,20 +4,6 @@ author			"IPFire Team"
 start on started messagebus
 stop on stopping messagebus
 
-console output
-
+exec /usr/sbin/hald --use-syslog --daemon=yes --retain-privileges
 expect fork
 respawn
-exec /usr/sbin/hald --use-syslog --daemon=yes --retain-privileges
-
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting HAL Daemon..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping HAL Daemon..."
-end script
diff --git a/src/initscripts/extras/messagebus.conf b/src/initscripts/extras/messagebus.conf
index 51abbbdaa..c559c70dc 100644
--- a/src/initscripts/extras/messagebus.conf
+++ b/src/initscripts/extras/messagebus.conf
@@ -4,23 +4,9 @@ author			"IPFire Team"
 start on stopped mountfs
 stop on shutdown
 
-console output
-
-respawn
 exec /usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf --nofork
+respawn
 
 pre-start script
 	dbus-uuidgen --ensure >/dev/null
 end script
-
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting the D-Bus Messagebus Daemon..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping the D-Bus Messagebus Daemon..."
-end script