initscripts: Removed some console output.

diff --git a/src/initscripts/core/sysctl.conf b/src/initscripts/core/sysctl.conf
index af2d33c14da14717ca91c8115f630ea14a4bf3ef..2289a9a91c642c6e59c0f24b2cc4760c35d961d9 100644 (file)
--- 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 f22b92479dd283ba5f47cd568506fadeb2a230d8..f2ab45ef6abefbaf43171feb5c59c50d552fd401 100644 (file)
--- 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 cfa5eb129cd2133daa10ff0816240964daf0a74b..754ccd7659c42cebdc77586b4eeedbfc3b074a48 100644 (file)
--- 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 39a565cfb7204396ca4b415905dca4418f9065f3..e9dcab8f0d47092b90fcd62f4b6d7818c3cd1438 100644 (file)
--- 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 9edf529aaf1a31411ba84ff0685b5a7478be2d98..8c5d89365e9be63408509bfb5e4d30e0fbd08a80 100644 (file)
--- 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 c9c33b2b2ba19f0e45b25cacfa6445aba553f1e7..ee4dac6fd8491fe094e373649265892d4dc21eac 100644 (file)
--- 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 eb1772a5eac710ca0457813cb16304fca7dabc7d..c6f3d4f51353dd1b5e5adcd1e5969794b037afe5 100644 (file)
--- 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 9782684008056427de95eda9b8442a1cf733c001..d65b6d3c7e6e0167df79aad51ef495b03154b3b1 100644 (file)
--- 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 f04fc0cc66359070f672eda550129b8b92b45592..9c1538c485a52e6d5fa0e6c6e57f3121c86e96a8 100644 (file)
--- 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 fc0f6f471fced838e2d51433a076dbbb414e7c0b..9c4279e9f679e4e08db9be9bc894c00044916aae 100644 (file)
--- 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