1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:15:00 +02:00

save the real configured interface name in the 'device' variable when running scan_interfaces() - fixes pppoe problems

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4983 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-10-09 12:35:31 +00:00
parent 2f1f57762e
commit 564ea3531f
3 changed files with 3 additions and 6 deletions

View File

@ -9,10 +9,7 @@ addif() {
# 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" device
for dev in $ifs; do
[ "${dev%%\.*}" = "$INTERFACE" -a "$dev" != "$INTERFACE" ] && {
add_vlan "$dev"

View File

@ -33,9 +33,10 @@ scan_interfaces() {
config_get proto "$CONFIG_SECTION" proto
append interfaces "$CONFIG_SECTION"
config_get iftype "$CONFIG_SECTION" type
config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" device "$ifname"
case "$iftype" in
bridge)
config_get ifname "$CONFIG_SECTION" ifname
config_set "$CONFIG_SECTION" ifnames "$ifname"
config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
;;

View File

@ -1,7 +1,6 @@
scan_ppp() {
config_get ifname "$1" ifname
pppdev="${pppdev:-0}"
config_set "$1" device "$ifname"
config_set "$1" ifname "ppp$pppdev"
config_set "$1" unit "$pppdev"
}