brcm-2.4: Fixed preinit and failsafe switch configuration

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21417 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/.gitignore b/.gitignore
index e347975..6142076 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .*.swp
 /env
 /dl
-/.config
 /.config.old
 /bin
 /build_dir
@@ -9,7 +8,5 @@
 /tmp
 /logs
 /feeds
-/feeds.conf
-/files
 /package/feeds
 /package/openwrt-packages

diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm b/target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm
new file mode 100644 (file)
index 0000000..0bfce5f
--- /dev/null
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/05_failsafe_config_switch_brcm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+failsafe_config_switch() {
+       [ -d /proc/switch/eth0 ] && [ "$ifname" = "eth0" ] && {
+               echo "0 1 2 3 4 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
+       }
+}
+
+boot_hook_add failsafe failsafe_config_switch
+

diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm b/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
index 1bef26b..fdc7c71 100644 (file)
--- a/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/15_set_preinit_interface_brcm
@@ -30,9 +30,10 @@ preinit_net_echo() {
                        echo "$port ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
                        port_net_echo $1
                }; done
+               
+               echo "0 ${cpu_port:-5u*}" > /proc/switch/eth0/vlan/0/ports
+               
        } || port_net_echo $1
-
-       preinit_ip_deconfig
 }
 
 

diff --git a/target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo b/target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo
new file mode 100644 (file)
index 0000000..f030cb2
--- /dev/null
+++ b/target/linux/brcm-2.4/base-files/lib/preinit/20_failsafe_net_echo
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+indicate_failsafe() {
+       preinit_net_echo() {
+               port_net_echo $1
+       }
+       echo "- failsafe -"
+       preinit_net_echo "Entering Failsafe!\n"
+       indicate_failsafe_led
+}
+
+