merge r17469-17471 to 8.09 - fixes failsafe mode on fonera+ and fonera 2.0

[openwrt/svn-archive/archive.git] / target / linux / atheros / base-files / etc / preinit.arch

diff --git a/target/linux/atheros/base-files/etc/preinit.arch b/target/linux/atheros/base-files/etc/preinit.arch
index 7e911ab2adab520e87679cc8566b0e1a09ea23e9..2cc3318f9478e51d935579c76060cc402fbb0009 100755 (executable)
--- a/target/linux/atheros/base-files/etc/preinit.arch
+++ b/target/linux/atheros/base-files/etc/preinit.arch
@@ -1,8 +1,22 @@
 # reset button only supported on ar5315+ at the moment
 grep 'Atheros AR231[567]' /proc/cpuinfo > /dev/null && {
-       ifname=eth0
+       if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
+            -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:1f" ]; then
+               vconfig set_name_type DEV_PLUS_VID_NO_PAD
+               ifconfig eth0 up
+               vconfig add eth0 0
+               ifname=eth0.0
+       else
+               ifname=eth0
+       fi
        failsafe_ip
        netmsg 192.168.1.255 "Press reset now, to enter Failsafe!"
        ifconfig "$ifname" 0.0.0.0 down
        sleep 2
+       if [ -z "$FAILSAFE" -a \
+            \( -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \
+               -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:1f" \) ]; then
+               vconfig rem eth0.0
+               ifconfig eth0 down
+       fi
 }