diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-24 22:06:56 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-24 22:06:56 +0000 |
| commit | b053ab6499575fccf2353bea6dd0f93001d9f132 (patch) | |
| tree | 17a785b661129a3d3d69d2685819329a1b0e4e6e | |
| parent | 38fc40e0c5cf7f2bc9c2b6167432307f6536ad32 (diff) | |
atheros: do not alter the network vlan config if swconfig is required and missing
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17388 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/atheros/base-files/etc/uci-defaults/network | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/atheros/base-files/etc/uci-defaults/network b/target/linux/atheros/base-files/etc/uci-defaults/network index 68b9a2a27..af7cfb0af 100644 --- a/target/linux/atheros/base-files/etc/uci-defaults/network +++ b/target/linux/atheros/base-files/etc/uci-defaults/network @@ -1,17 +1,5 @@ #!/bin/sh -if [ -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ - -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -o \ - -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then - uci batch <<EOF -set network.lan.ifname=eth0.1 -set network.wan=interface -set network.wan.ifname=eth0.2 -set network.wan.proto=dhcp -EOF - HAS_SWITCH=1 -fi - -if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" ]; then +if [ -e "/sys/bus/mdio_bus/drivers/IC+ IP175C/0:00" -a -x /sbin/swconfig ]; then uci batch <<EOF set network.eth0=switch set network.eth0.reset=1 @@ -28,6 +16,18 @@ EOF HAS_SWITCH=1 fi +if [ -n "$HAS_SWITCH" -o \ + -e "/sys/bus/mdio_bus/drivers/Infineon ADM6996/0:00" -o \ + -e "/sys/bus/mdio_bus/drivers/Marvell 88E6060/0:10" ]; then + uci batch <<EOF +set network.lan.ifname=eth0.1 +set network.wan=interface +set network.wan.ifname=eth0.2 +set network.wan.proto=dhcp +EOF + HAS_SWITCH=1 +fi + [ -z "$HAS_SWITCH" -a -d /sys/class/net/eth1 ] && { uci batch <<EOF set network.wan=interface |