diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-08-24 22:06:56 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-08-24 22:06:56 +0000 |
| commit | 394cf886658e6f3fe794d6d6489eb5578ed26dc6 (patch) | |
| tree | c17b59497fb7f677095496c7b0cc6db12e41d4e9 | |
| parent | d498ff436a1ad0fd73a549ea5631203e938dcbcf (diff) | |
| download | master-31e0f0ae-394cf886658e6f3fe794d6d6489eb5578ed26dc6.tar.gz master-31e0f0ae-394cf886658e6f3fe794d6d6489eb5578ed26dc6.tar.bz2 master-31e0f0ae-394cf886658e6f3fe794d6d6489eb5578ed26dc6.zip | |
atheros: do not alter the network vlan config if swconfig is required and missing
SVN-Revision: 17388
| -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 68b9a2a27d..af7cfb0afa 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 |