Browse Source

Rework the logging daemons startup

The logging mechanism startup being in inittab, it isn't easy to
overcharge the default policy. With this patch, the startup of the
syslog daemon is moved to an init.d script, that can easily be
overwritten.

[Peter: use install -D]
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Maxime Ripard 14 years ago
parent
commit
ad501b6634
3 changed files with 32 additions and 2 deletions
  1. 0 2
      fs/skeleton/etc/inittab
  2. 26 0
      package/busybox/S01logging
  3. 6 0
      package/busybox/busybox.mk

+ 0 - 2
fs/skeleton/etc/inittab

@@ -28,8 +28,6 @@ null::sysinit:/bin/hostname -F /etc/hostname
 
 
 # Logging junk
 # Logging junk
 null::sysinit:/bin/touch /var/log/messages
 null::sysinit:/bin/touch /var/log/messages
-null::respawn:/sbin/syslogd -n -m 0
-null::respawn:/sbin/klogd -n
 tty3::respawn:/usr/bin/tail -f /var/log/messages
 tty3::respawn:/usr/bin/tail -f /var/log/messages
 
 
 # Stuff to do for the 3-finger salute
 # Stuff to do for the 3-finger salute

+ 26 - 0
package/busybox/S01logging

@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# Start logging
+#
+
+case "$1" in
+  start)
+	echo -n "Starting logging :"
+	start-stop-daemon -S -q -p /var/run/syslog.pid --exec /sbin/syslogd -- -m 0
+	start-stop-daemon -S -q -p /var/run/klogd.pid --exec /sbin/klogd
+	echo "OK"
+	;;
+  stop)
+	echo -n "Stopping logging :"
+	start-stop-daemon -K -q -p /var/run/syslog.pid
+	start-stop-daemon -K -q -p /var/run/klogd.pid
+	echo "OK"
+	;;
+  restart|reload)
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart}"
+	exit 1
+esac
+
+exit $?

+ 6 - 0
package/busybox/busybox.mk

@@ -122,6 +122,11 @@ define BUSYBOX_DISABLE_MMU_APPLETS
 endef
 endef
 endif
 endif
 
 
+define BUSYBOX_INSTALL_LOGGING_SCRIPT
+	$(INSTALL) -m 0755 -D package/busybox/S01logging \
+		$(TARGET_DIR)/etc/init.d/S01logging
+endef
+
 # We do this here to avoid busting a modified .config in configure
 # We do this here to avoid busting a modified .config in configure
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 BUSYBOX_POST_EXTRACT_HOOKS += BUSYBOX_COPY_CONFIG
 
 
@@ -152,6 +157,7 @@ define BUSYBOX_INSTALL_TARGET_CMDS
 			$(TARGET_DIR)/usr/share/udhcpc/default.script; \
 			$(TARGET_DIR)/usr/share/udhcpc/default.script; \
 	fi
 	fi
 	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
 	$(BUSYBOX_INSTALL_MDEV_SCRIPT)
+	$(BUSYBOX_INSTALL_LOGGING_SCRIPT)
 endef
 endef
 
 
 define BUSYBOX_UNINSTALL_TARGET_CMDS
 define BUSYBOX_UNINSTALL_TARGET_CMDS