fix remaining *_ifnames references

SVN-Revision: 4650
This commit is contained in:
Felix Fietkau 2006-08-24 12:20:02 +00:00
parent 12fed89aa2
commit a0a9319149
4 changed files with 5 additions and 15 deletions

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"