userspace: don't start rsyslog if unconfigured

Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

userspace: don't start rsyslog if unconfigured
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
c48988ce · Alessandro Rubini · 0b21e8ad · c48988ce · c48988ce
Commit c48988ce authored Sep 30, 2014 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 40 additions and 4 deletions

S50syslogd userspace/rootfs_override/etc/init.d/S50syslogd +40 -0

inittab userspace/rootfs_override/etc/inittab +0 -4

No files found.
--- a/userspace/rootfs_override/etc/init.d/S50syslogd
+++ b/userspace/rootfs_override/etc/init.d/S50syslogd
+#!/bin/sh
+
+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
+	echo "OK"
+    else
+	echo "Not starting rsyslog: no target host selected"
+    fi
+}
+
+stop() {
+    if pidof rsyslogd > /dev/null; then
+	echo -n "Stopping rsyslog: "
+	start-stop-daemon -K -q -p /var/log/rsyslog.pid
+	echo "OK"
+    fi
+}
+restart() {
+    stop
+    start
+}
+
+case "$1" in
+  start)
+  	start
+	;;
+  stop)
+  	stop
+	;;
+  restart|reload)
+  	restart
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+	;;
+esac
--- a/userspace/rootfs_override/etc/inittab
+++ b/userspace/rootfs_override/etc/inittab
@@ -28,10 +28,6 @@
 ttyGS0::respawn:/bin/ash --login
 ttyS0::respawn:/bin/ash --login

-# Logging junk
-null::sysinit:/usr/sbin/rsyslogd
-
 # Stuff to do before rebooting
-null::shutdown:/usr/bin/killall rsyslogd
 null::shutdown:/bin/umount -a -r