fix remaining *_ifnames references

SVN-Revision: 4650

diff --git a/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig b/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig
index a4d29358bc2100ba22302b390c5976e89e254f1d..2efd596aa8e50cec7f08925612be81c54b0a119c 100755 (executable)
--- a/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig
+++ b/openwrt/package/base-files/brcm-2.4/etc/init.d/S05netconfig
@@ -64,7 +64,7 @@ END {
        print "#### LAN configuration"
        print "config interface lan"
        print " option type     bridge"
-       p("ifnames", "lan_ifname")
+       p("ifname", "lan_ifname")
        print " option proto    static"
        print " option ipaddr   192.168.1.1"
        print " option netmask  255.255.255.0"

diff --git a/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig b/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig
index a4d29358bc2100ba22302b390c5976e89e254f1d..2efd596aa8e50cec7f08925612be81c54b0a119c 100755 (executable)
--- a/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig
+++ b/openwrt/package/base-files/brcm-2.6/etc/init.d/S05netconfig
@@ -64,7 +64,7 @@ END {
        print "#### LAN configuration"
        print "config interface lan"
        print " option type     bridge"
-       p("ifnames", "lan_ifname")
+       p("ifname", "lan_ifname")
        print " option proto    static"
        print " option ipaddr   192.168.1.1"
        print " option netmask  255.255.255.0"

diff --git a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index 72146a1d78317f74f24b8b0f1eb82bc66a6fcb7a..8661a2851da565ed4f9ec875cbd469008238f9a8 100644 (file)
--- a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
@@ -5,14 +5,11 @@ include network
 addif() {
        scan_interfaces
        setup_interface "$INTERFACE"
-       
+
        # find all vlan configurations for this interface and set them up as well
        for ifc in $interfaces; do
                config_get iftype "$ifc" type
-               case "$iftype" in
-                       bridge) config_get ifs "$ifc" ifnames;;
-                       *) config_get ifs "$ifc" ifname;;
-               esac
+               config_get ifs "$ifc" ifname
                for dev in $ifs; do
                        [ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
                                add_vlan "$dev"

diff --git a/openwrt/package/base-files/default/sbin/ifup b/openwrt/package/base-files/default/sbin/ifup
index c40de38ad8f13a947f29b4f0a2b258db5feccd71..86d10d7ca3f96fd5e25f6bcec16d4ed139d6e051 100755 (executable)
--- a/openwrt/package/base-files/default/sbin/ifup
+++ b/openwrt/package/base-files/default/sbin/ifup
@@ -4,14 +4,7 @@
 . /sbin/ifdown "$@"
 
 config_get iftype "$1" type
-case "$iftype" in
-       bridge)
-               config_get ifname "$1" ifnames
-       ;;
-       *)
-               config_get ifname "$1" ifname
-       ;;
-esac
+config_get ifname "$1" ifname
 
 for dev in $ifname; do
        setup_interface "$dev" "$1"