From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 9 Aug 2009 19:21:58 +0000 (+0200)
Subject: initscripts: Removed some console output.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2feb4cc1d0b0cb77afa24540b11ca920f928aa4;p=ipfire-3.x.git

initscripts: Removed some console output.
---

diff --git a/src/initscripts/core/sysctl.conf b/src/initscripts/core/sysctl.conf
index af2d33c14..2289a9a91 100644
--- a/src/initscripts/core/sysctl.conf
+++ b/src/initscripts/core/sysctl.conf
@@ -3,21 +3,12 @@ author			"IPFire Team"
 
 start on stopped mount-kernel-filesystems
 
-console output
-
 script
-	set -e
-	. /etc/init/functions
-
     if [ -f "/etc/sysctl.conf" ]; then
-        message="Setting kernel runtime parameters..."
         sysctl -q -p
-        evaluate_retval standard
     fi
     if [ -d "/proc/sys/kernel/grsecurity" -a \
          -f "/etc/grsec/sysctl.conf" ]; then
-        message="Setting grsecurity parameters..."
         sysctl -q -p /etc/grsec/sysctl.conf
-        evaluate_retval standard
     fi
 end script
diff --git a/src/initscripts/core/udev.conf b/src/initscripts/core/udev.conf
index f22b92479..f2ab45ef6 100644
--- a/src/initscripts/core/udev.conf
+++ b/src/initscripts/core/udev.conf
@@ -23,10 +23,5 @@ pre-start script
 	cp -a /lib/udev/devices/* /dev
 end script
 
-respawn
 exec /sbin/udevd
-
-post-start script
-	. /etc/init/functions
-	log_success_msg "Starting udev Daemon..."
-end script
+respawn
diff --git a/src/initscripts/core/udevtrigger.conf b/src/initscripts/core/udevtrigger.conf
index cfa5eb129..754ccd765 100644
--- a/src/initscripts/core/udevtrigger.conf
+++ b/src/initscripts/core/udevtrigger.conf
@@ -6,16 +6,10 @@ start on started udev
 console output
 
 script
-	set -e
-	. /etc/init/functions
-
-	MESSAGE="Populating /dev with device nodes..."
-
 	# Now traverse /sys in order to "coldplug" devices that have
 	# already been discovered
 	udevadm trigger
 
 	# Now wait for udevd to process the uevents we triggered
 	udevadm settle --timeout=5 || true
-	evaluate_retval standard
 end script
diff --git a/src/initscripts/extras/fcron.conf b/src/initscripts/extras/fcron.conf
index 39a565cfb..e9dcab8f0 100644
--- a/src/initscripts/extras/fcron.conf
+++ b/src/initscripts/extras/fcron.conf
@@ -4,20 +4,6 @@ author			"IPFire Team"
 start on stopped mountfs
 stop on shutdown
 
-console output
-
+exec /usr/sbin/fcron -y -b
 expect fork
 respawn
-exec /usr/sbin/fcron -y -b
-
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting Cron Daemon..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping Cron Daemon..."
-end script
diff --git a/src/initscripts/extras/firewall.conf b/src/initscripts/extras/firewall.conf
index 9edf529aa..8c5d89365 100644
--- a/src/initscripts/extras/firewall.conf
+++ b/src/initscripts/extras/firewall.conf
@@ -4,8 +4,6 @@ author			"IPFire Team"
 start on starting network
 stop on stopped network
 
-console output
-
 pre-start script
 	firewall start
 end script
diff --git a/src/initscripts/extras/lighttpd.conf b/src/initscripts/extras/lighttpd.conf
index c9c33b2b2..ee4dac6fd 100644
--- a/src/initscripts/extras/lighttpd.conf
+++ b/src/initscripts/extras/lighttpd.conf
@@ -4,18 +4,5 @@ author			"IPFire Team"
 start on started network
 stop on stopping network
 
-console output
-
 exec /usr/sbin/lighttpd -f /etc/lighttpd.conf
-
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting Lighttpd Daemon..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping Lighttpd Daemon..."
-end script
+expect fork
diff --git a/src/initscripts/extras/network.conf b/src/initscripts/extras/network.conf
index eb1772a5e..c6f3d4f51 100644
--- a/src/initscripts/extras/network.conf
+++ b/src/initscripts/extras/network.conf
@@ -4,8 +4,6 @@ author			"IPFire Team"
 start on stopped mountfs
 stop on shutdown
 
-console output
-
 pre-start script
 	network start
 end script
diff --git a/src/initscripts/extras/openldap.conf b/src/initscripts/extras/openldap.conf
index 978268400..d65b6d3c7 100644
--- a/src/initscripts/extras/openldap.conf
+++ b/src/initscripts/extras/openldap.conf
@@ -4,20 +4,6 @@ author			"IPFire Team"
 start on started mountfs
 stop on shutdown
 
-console output
-
+exec /usr/sbin/slapd
 expect fork
 respawn
-exec /usr/sbin/slapd
-
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting OpenLDAP slapd..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping OpenLDAP slapd..."
-end script
diff --git a/src/initscripts/extras/openssh.conf b/src/initscripts/extras/openssh.conf
index f04fc0cc6..9c1538c48 100644
--- a/src/initscripts/extras/openssh.conf
+++ b/src/initscripts/extras/openssh.conf
@@ -4,11 +4,6 @@ author			"IPFire Team"
 start on started network
 stop on stopping network
 
-console output
-
-respawn
-exec /usr/sbin/sshd -D
-
 pre-start script
 	for algo in dsa rsa; do
 		[ -e "/etc/ssh/ssh_host_${algo}_key" ] && continue
@@ -16,14 +11,5 @@ pre-start script
 	done
 end script
 
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting OpenSSH Server..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping OpenSSH Server..."
-end script
+exec /usr/sbin/sshd -D
+respawn
diff --git a/src/initscripts/extras/syslog-ng.conf b/src/initscripts/extras/syslog-ng.conf
index fc0f6f471..9c4279e9f 100644
--- a/src/initscripts/extras/syslog-ng.conf
+++ b/src/initscripts/extras/syslog-ng.conf
@@ -4,19 +4,5 @@ author			"IPFire Team"
 start on stopped mountfs
 stop on shutdown
 
-console output
-
-respawn
 exec /sbin/syslog-ng -F
-
-post-start script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Starting System Log Daemon..."
-end script
-
-post-stop script
-	set -e
-	. /etc/init/functions
-	log_success_msg "Stopping System Log Daemon..."
-end script
+respawn