From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Dec 2008 11:30:32 +0000 (+0100)
Subject: Updated the initscript that starts the syslog daemon.
X-Git-Tag: v3.0-alpha1~408
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a416aa7b10c428502136e4ffd3dba07fb03b60b;p=ipfire-3.x.git

Updated the initscript that starts the syslog daemon.
---

diff --git a/src/initscripts/core/sysklogd b/src/initscripts/core/sysklogd
deleted file mode 100644
index 079707bdd..000000000
--- a/src/initscripts/core/sysklogd
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-# Begin /etc/init.d/sysklogd
-
-### BEGIN INIT INFO
-# Provides:            $syslog
-# Required-Start:      localnet
-# Should-Start:
-# Required-Stop:       $local_fs sendsignals
-# Should-Stop:
-# Default-Start:       2 3 4 5
-# Default-Stop:        0 1 6
-# Short-Description:   Starts kernel and system log daemons.
-# Description:         Starts kernel and system log daemons.
-# X-LFS-Default-Start: S10
-# X-LFS-Default-Stop:  K90
-# X-LFS-Provided-By:   LFS
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-case "${1}" in
-    start)
-        MESSAGE="system log daemon..."
-        start_daemon /usr/sbin/syslogd -m 0
-        evaluate_retval start
-
-        MESSAGE="kernel log daemon..."
-        start_daemon /usr/sbin/klogd
-        evaluate_retval start
-        ;;
-
-    stop)
-        MESSAGE="kernel log daemon..."
-        killproc /usr/sbin/klogd
-        evaluate_retval stop
-
-        MESSAGE="system log daemon..."
-        killproc /usr/sbin/syslogd
-        evaluate_retval stop
-        ;;
-
-    force-reload)
-        MESSAGE="system log daemon config file..."
-        killproc -HUP `/usr/sbin/syslogd`
-        evaluate_retval reload
-        ;;
-
-    restart)
-        MESSAGE="system and kernel log deamons..."
-        failed=0
-        killproc /usr/sbin/klogd || failed=1
-        killproc /usr/sbin/syslogd || failed=1
-        start_daemon /usr/sbin/syslogd -m 0 || failed=1
-        start_daemon /usr/sbin/klogd || failed=1
-        (exit ${failed})
-        evaluate_retval restart
-        ;;
-
-    status)
-        statusproc /usr/sbin/syslogd
-        statusproc /usr/sbin/klogd
-        ;;
-
-    *)
-        echo "Usage: ${0} {start|stop|force-reload|restart|status}"
-        exit 1
-        ;;
-esac
-
-# End /etc/init.d/sysklogd
diff --git a/src/initscripts/core/syslog-ng b/src/initscripts/core/syslog-ng
new file mode 100644
index 000000000..8f54578d7
--- /dev/null
+++ b/src/initscripts/core/syslog-ng
@@ -0,0 +1,55 @@
+#!/bin/sh
+# Begin /etc/init.d/syslog-ng
+
+### BEGIN INIT INFO
+# Provides:            $syslog
+# Required-Start:      localnet
+# Should-Start:
+# Required-Stop:       $local_fs sendsignals
+# Should-Stop:
+# Default-Start:       2 3 4 5
+# Default-Stop:        0 1 6
+# Short-Description:   Starts the system log daemon.
+# Description:         Starts the system log daemon.
+# X-LFS-Default-Start: S10
+# X-LFS-Default-Stop:  K90
+# X-LFS-Provided-By:   LFS
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+MESSAGE="System Log Daemon"
+BIN_FILE="/sbin/syslog-ng"
+
+case "${1}" in
+    start)
+        loadproc
+        evaluate_retval start
+        ;;
+
+    stop)
+        endproc
+        evaluate_retval stop
+        ;;
+
+    force-reload)
+        reloadproc -force
+        evaluate_retval force-reload
+        ;;
+
+    restart)
+        $0 stop
+        $0 start
+        ;;
+
+    status)
+        statusproc
+        ;;
+
+    *)
+        echo "Usage: ${0} {start|stop|force-reload|restart|status}"
+        exit 1
+        ;;
+esac
+
+# End /etc/init.d/syslog-ng