rootfs: improve syslogd's init script

Use start-stop-daemon to start/stop syslogd daemon. Distinguish between start-stop-daemon return value 0, 1 and the rest. Fix syslog's pid filename (was /var/log/rsyslog.pid now is /var/run/rsyslogd.pid). Signed-off-by: Adam Wujek <adam.wujek@cern.ch>

rootfs: improve syslogd's init script
Use start-stop-daemon to start/stop syslogd daemon. Distinguish between start-stop-daemon return value 0, 1 and the rest. Fix syslog's pid filename (was /var/log/rsyslog.pid now is /var/run/rsyslogd.pid). Signed-off-by: Adam Wujek <adam.wujek@cern.ch>
7bf2fc8a · Adam Wujek · 5c26a28b · 7bf2fc8a
Commit 7bf2fc8a authored Jun 22, 2015 by Adam Wujek 💬
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 6 deletions

syslogd userspace/rootfs_override/etc/init.d/syslogd +17 -6

No files found.
--- a/userspace/rootfs_override/etc/init.d/syslogd
+++ b/userspace/rootfs_override/etc/init.d/syslogd
@@ -17,9 +17,17 @@ start() {
    # Check the configuration file: if there's no target, don't run the thing.
    if ! grep -q '^##.*remote-host' /etc/rsyslog.conf; then
 	echo -n "Starting rsyslog: "
-	/usr/sbin/rsyslogd
+	start-stop-daemon -q -p /var/run/rsyslogd.pid -S \
+		--exec /usr/sbin/rsyslogd
+	ret=$?
+	if [ $ret -eq 0 ]; then
 	    start_counter
 	    echo "OK"
+	elif [ $ret -eq 1 ]; then
+	    echo "Failed (already running?)"
+	else
+	    echo "Failed"
+	fi
    else
 	echo "Not starting rsyslog: no target host selected"
 	# avoid SNMPd complaints about lack of start counter file
@@ -28,12 +36,15 @@ start() {
 }

 stop() {
-    if pidof rsyslogd > /dev/null; then
    echo -n "Stopping rsyslog: "
-	start-stop-daemon -K -q -p /var/log/rsyslog.pid
+    start-stop-daemon -K -q -p /var/run/rsyslogd.pid
+    if [ $? -eq 0 ]; then
 	echo "OK"
+    else
+	echo "Failed"
    fi
 }
+
 restart() {
    stop
    start