X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/3fef5a6916d329dad1314e4aafef466010734829..f90cb20b9a2c4e4c5d8f3af569264726fb6ddcf8:/package/base-files/files/etc/preinit?ds=sidebyside

diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
index 85dbf314d..452209ff9 100755
--- a/package/base-files/files/etc/preinit
+++ b/package/base-files/files/etc/preinit
@@ -3,7 +3,16 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 . /etc/diag.sh
 
+failsafe_ip() {
+	ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
+}
+
 failsafe() {
+	[ -n "$ifname" ] && grep "$ifname" /proc/net/dev >/dev/null && {
+		failsafe_ip
+		netmsg 192.168.1.255 "Entering Failsafe!"
+		telnetd -l /bin/login <> /dev/null 2>&1
+	}
 	lock /tmp/.failsafe
 	ash --login
 }
@@ -23,7 +32,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 +52,24 @@ 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 "$HOTPLUG" > /proc/sys/kernel/hotplug
-
-	eval ${FAILSAFE:+failsafe}
-	lock -w /tmp/.failsafe
-
-	mount_root
-
-	echo "- init -"
-} | tee /tmp/preinit.log
+echo "- preinit -"
+trap 'FAILSAFE=true' USR1
+[ -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
+[ -f /sysupgrade.tgz ] && {
+	echo "- config restore -"
+	cd /
+	mv sysupgrade.tgz /tmp
+	tar xzf /tmp/sysupgrade.tgz
+	rm -f /tmp/sysupgrade.tgz
+	sync
+}
 
+echo "- init -"
+	
+killall hotplug2
 exec /sbin/init