rcS: wait for init scripts to complete before initiating the shutdown (patch from...

SVN-Revision: 15530

diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
index 85064248e4222e56095d3104e7ac0801af176969..12226be7884dcd4af95a2691dcfbd101b3864b44 100755 (executable)
--- a/package/base-files/files/etc/init.d/boot
+++ b/package/base-files/files/etc/init.d/boot
@@ -52,7 +52,7 @@ start() {
 
        killall -q hotplug2
        [ -x /sbin/hotplug2 ] && /sbin/hotplug2 --override --persistent \
-                       --max-children 1 --no-coldplug &
+                       --max-children 1 --no-coldplug >/dev/null 2>&1 &
 
        # the coldplugging of network interfaces needs to happen later, so we do it manually here
        for iface in $(awk -F: '/:/ {print $1}' /proc/net/dev); do

diff --git a/package/base-files/files/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS
index 8c9114d3368f36fa64154aeaac11f9cb94f622f6..c135024bea223ad4febc344486aa9c9aa3daaf55 100755 (executable)
--- a/package/base-files/files/etc/init.d/rcS
+++ b/package/base-files/files/etc/init.d/rcS
@@ -1,11 +1,17 @@
 #!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 
+run_scripts() {
+       for i in /etc/rc.d/$1*; do
+               [ -x $i ] && $i $2 2>&1
+       done | $LOGGER
+}
+
 LOGGER="cat"
 [ -x /usr/bin/logger ] && LOGGER="logger -s -p 6 -t sysinit"
 
-{
-       for i in /etc/rc.d/$1*; do
-               [ -x $i ] && $i $2 2>&1
-       done 
-} | $LOGGER &
+if [ "$1" = "S" ]; then
+       run_scripts "$1" "$2" &
+else
+       run_scripts "$1" "$2"
+fi