diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-08-23 18:47:31 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-08-23 18:47:31 +0000 |
| commit | 4610174ffd96ea7313abc034ab7ff9cb6da13ca5 (patch) | |
| tree | dfc75130702d9042aaefe6ad695241945b520a96 /package/base-files/brcm-2.4 | |
| parent | 4fee97645f4cfadbecb734977d2c4de32adc33ff (diff) | |
| download | upstream-4610174ffd96ea7313abc034ab7ff9cb6da13ca5.tar.gz upstream-4610174ffd96ea7313abc034ab7ff9cb6da13ca5.tar.bz2 upstream-4610174ffd96ea7313abc034ab7ff9cb6da13ca5.zip | |
change 'ifnames' to 'ifname' in network config, fix #697
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4638 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/brcm-2.4')
| -rwxr-xr-x | package/base-files/brcm-2.4/etc/init.d/S05netconfig | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/package/base-files/brcm-2.4/etc/init.d/S05netconfig b/package/base-files/brcm-2.4/etc/init.d/S05netconfig index 82e4ab9986..a4d29358bc 100755 --- a/package/base-files/brcm-2.4/etc/init.d/S05netconfig +++ b/package/base-files/brcm-2.4/etc/init.d/S05netconfig @@ -6,7 +6,7 @@ mkdir -p /etc/config ( - if grep 'mtd0: 00060000' /proc/mtd 2>&- >&-; then + if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then # WGT634u echo boardtype=wgt634u else @@ -19,9 +19,7 @@ function p(cfgname, name) { BEGIN { FS="=" - c["lan_ifname"]="br0" - c["lan_ifnames"]="eth0.0 wl0" - c["wan_proto"]="none" + c["lan_ifname"]="eth0.0 wl0" c["wan_ifname"]="eth0.1" c["vlan0ports"]="1 2 3 4 5*" c["vlan1ports"]="0 5" @@ -36,14 +34,14 @@ END { if (nvram["boardtype"] == "bcm94710dev") { # Asus WL-500g if (nvram["boardnum"] == "asusX") { - c["lan_ifnames"]="eth0 eth1 wl0" # FIXME + c["lan_ifname"]="eth0 eth1 wl0" # FIXME c["wan_ifname"]="" } } if (nvram["boardtype"] == "wgt634u") { c["vlan0ports"] = "0 1 2 3 5*" c["vlan1ports"] = "4 5" - c["lan_ifnames"] = "eth0.0 ath0" + c["lan_ifname"] = "eth0.0 ath0" } if ((nvram["boardtype"] == "0x0467") || (nvram["boardtype"] == "0x042f")) { c["vlan0ports"] = "0 1 2 3 5*" @@ -53,7 +51,7 @@ END { # WAP54G if ((nvram["boardnum"] == "2") || \ (nvram["boardnum"] == "1024")) { - c["lan_ifnames"]="eth0 wl0" + c["lan_ifname"]="eth0 wl0" c["wan_ifname"]="" } @@ -66,7 +64,7 @@ END { print "#### LAN configuration" print "config interface lan" print " option type bridge" - p("ifnames", "lan_ifnames") + p("ifnames", "lan_ifname") print " option proto static" print " option ipaddr 192.168.1.1" print " option netmask 255.255.255.0" |