From 5b3fb5bf8f322ee4c1a579086721b11b9564e4b5 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 3 Nov 2006 04:26:47 +0000
Subject: [PATCH] move the post-failsafe code from preinit to rcS, so that the
 serial console is accessible in failsafe

SVN-Revision: 5400
---
 .../package/base-files/default/etc/init.d/rcS | 33 ++++++++++++++-----
 .../package/base-files/default/etc/preinit    | 15 ---------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/openwrt/package/base-files/default/etc/init.d/rcS b/openwrt/package/base-files/default/etc/init.d/rcS
index d93c81224c..c887a19eb5 100755
--- a/openwrt/package/base-files/default/etc/init.d/rcS
+++ b/openwrt/package/base-files/default/etc/init.d/rcS
@@ -1,9 +1,26 @@
 #!/bin/sh
-syslog_ip=$(nvram get log_ipaddr)
-eval $(ipcalc "$syslog_ip")
-[ "$syslog_ip" = "$IP" ] || syslog_ip=""
-syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
-klogd
-for i in /etc/init.d/S*; do
-  $i start 2>&1
-done | logger -s -p 6 -t '' &
+(
+	lock -w /tmp/.failsafe
+	echo /sbin/hotplug > /proc/sys/kernel/hotplug
+	
+	ifconfig $ifname 0.0.0.0 down
+	
+	# revert to the boot loader's vlan config
+	# required for at least WRT54G v1.1
+	[ -d /proc/switch/eth0 ] && {
+		echo "$v0p" > /proc/switch/eth0/vlan/0/ports
+		echo "$v1p" > /proc/switch/eth0/vlan/1/ports
+		echo "$v2p" > /proc/switch/eth0/vlan/2/ports
+	}
+	
+	mount_root
+	
+	syslog_ip=$(nvram get log_ipaddr)
+	eval $(ipcalc "$syslog_ip")
+	[ "$syslog_ip" = "$IP" ] || syslog_ip=""
+	syslogd -C 16 ${syslog_ip:+-L -R $syslog_ip}
+	klogd
+	for i in /etc/init.d/S*; do
+	  $i start 2>&1
+	done 
+) | logger -s -p 6 -t '' &
diff --git a/openwrt/package/base-files/default/etc/preinit b/openwrt/package/base-files/default/etc/preinit
index 716c9e668c..e8ac2d56ed 100755
--- a/openwrt/package/base-files/default/etc/preinit
+++ b/openwrt/package/base-files/default/etc/preinit
@@ -40,19 +40,4 @@ ifconfig $ifname 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
 } || netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
 
 sleep 2
-lock -w /tmp/.failsafe
-echo /sbin/hotplug > /proc/sys/kernel/hotplug
-
-ifconfig $ifname 0.0.0.0 down
-
-# revert to the boot loader's vlan config
-# required for at least WRT54G v1.1
-[ -d /proc/switch/eth0 ] && {
-	echo "$v0p" > /proc/switch/eth0/vlan/0/ports
-	echo "$v1p" > /proc/switch/eth0/vlan/1/ports
-	echo "$v2p" > /proc/switch/eth0/vlan/2/ports
-}
-
-mount_root
-
 exec /sbin/init
-- 
2.30.2