aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/etc/preinit
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-06-25 08:32:25 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-06-25 08:32:25 +0000
commitc20906011668315d50d629cb2d4dc46de9062d9a (patch)
tree1db4163deba31f36d771177dfcfabb21cd93f2ac /package/base-files/files/etc/preinit
parent21e832921cd728a2e039b1e4c3948a78a54f8938 (diff)
downloadupstream-c20906011668315d50d629cb2d4dc46de9062d9a.tar.gz
upstream-c20906011668315d50d629cb2d4dc46de9062d9a.tar.bz2
upstream-c20906011668315d50d629cb2d4dc46de9062d9a.zip
fix failsafe on broadcom, send netlink events in diag when running linux 2.6
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7722 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/etc/preinit')
-rwxr-xr-xpackage/base-files/files/etc/preinit26
1 files changed, 12 insertions, 14 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 85dbf314d3..e5fdd43ae1 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -23,7 +23,8 @@ else
mount -t tmpfs tmpfs /dev -o size=512K
mknod /dev/console c 5 1
mkdir /dev/shm
- /sbin/hotplug2 --no-persistent --coldplug --set-rules-file /etc/hotplug2-init.rules
+ /sbin/hotplug2 --coldplug --set-rules-file /etc/hotplug2-init.rules
+ /sbin/hotplug2 --no-coldplug --persistent --set-rules-file /etc/hotplug2-init.rules &
M0=/dev/ptmx
M1=/dev/ptmx
HOTPLUG=
@@ -42,19 +43,16 @@ dd if=/dev/console of=/dev/null bs=1 count=0 >/dev/null 2>/dev/null && {
exec <$M0 >$M1 2>&0
-{
- echo "- preinit -"
- [ -e /etc/preinit.arch ] && . /etc/preinit.arch
- set_state preinit
+echo "- preinit -"
- echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-
- eval ${FAILSAFE:+failsafe}
- lock -w /tmp/.failsafe
-
- mount_root
-
- echo "- init -"
-} | tee /tmp/preinit.log
+[ -e /etc/preinit.arch ] && . /etc/preinit.arch
+set_state preinit
+echo "$HOTPLUG" > /proc/sys/kernel/hotplug
+eval ${FAILSAFE:+failsafe}
+lock -w /tmp/.failsafe
+mount_root
+echo "- init -"
+
+killall hotplug2
exec /sbin/init