large init script cleanup and merge of whiterussian changes, new dnsmasq config handling

[openwrt.git] / openwrt / package / base-files / default / etc / preinit

diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index 0c59893..5b676ca 100755 (executable)
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -1,17 +1,11 @@
 #!/bin/sh
 #!/bin/sh

+export PATH=/bin:/sbin:/usr/bin:/usr/sbin

 mount none /proc -t proc
 mount none /proc -t proc

-insmod diag
-echo 0x01 > /proc/sys/diag
-sleep 1
-if [ $(cat /proc/sys/reset) = 1 ] || [ "$(/usr/sbin/nvram get failsafe)" = 1 ]; then
-       export FAILSAFE=true
-       [ "$(/usr/sbin/nvram get boot_wait)" != "on" ] && {
-               /usr/sbin/nvram set boot_wait=on
-               /usr/sbin/nvram commit
-       }
-       while :; do { echo $(((X=(X+1)%8)%2)) > /proc/sys/diag; sleep $((X==0)); } done &
-fi
-
-/sbin/mount_root ${FAILSAFE:+failsafe}

 
 

+[ -f /etc/preinit.arch ] && . /etc/preinit.arch
+[ -z "$FAILSAFE" ] || {
+       echo /bin/true > /proc/sys/kernel/hotplug
+       telnetd -l /bin/login <> /dev/null 2>&1
+}
+mount_root ${FAILSAFE:+failsafe}

 exec /sbin/init
 exec /sbin/init