Changeset 727556d in freewrt for package/base-files/files

Timestamp:

Sep 30, 2006, 12:11:58 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

d496977

Parents:

41b6d57

Message:

fix falsafe for jffs2 and squashfs root, fix old nvram based network configuration

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@777 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/base-files/files

Files:

• etc/preinit (modified) (1 diff)
• sbin/failsafe (modified) (1 diff)

package/base-files/files/etc/preinit

@@ -2 +2 @@
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 mount none /proc -t proc
+[ -f /etc/preinit.arch ] && . /etc/preinit.arch
+failsafe || /bin/sh
 cat /etc/.rnd >/dev/urandom 2>&1
-failsafe_if=eth0
-[ -f /etc/preinit.arch ] && . /etc/preinit.arch
-export failsafe_if
-failsafe
-mount_root ${FAILSAFE:+failsafe}
-unset failsafe_if
+mount_root 
 fwcf setup 2>&1 | logger -t fwcf
 exec /sbin/init

package/base-files/files/sbin/failsafe

@@ -1 +1 @@
 #!/bin/sh
 
-ifconfig $failsafe_if 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
-netmsg 192.168.1.0 "(dummy message)"
+ifconfig eth0 192.168.1.1 netmask 255.255.255.0 broadcast 192.168.1.255 up
+netmsg 192.168.1.0 "(dummy message)" # b44 eats the first packet
 netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
-echo "Press reset now to enter Failsafe for ${failsafe_if}!"
+echo "Press reset now to enter Failsafe!"
 sleep 2
 
-if [ "$(</proc/sys/reset 2>&-)" = 1 ]; then
+if [ $(cat /proc/sys/reset) = 1 ]; then
         while :; do
                 echo $(((X=(X+1)%8)%2)) >/proc/sys/diag
                 sleep $((X==0))
         done &
-        export FAILSAFE=true
         netmsg 192.168.1.255 "Entering Failsafe!"
         telnetd 
-else
-        ifconfig $failsafe_if 0.0.0.0
-        # 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
-        }
+        exit 1
 fi