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

SVN-Revision: 4983

openwrt/package/base-files/default/etc/hotplug.d/net/10-net

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

openwrt/package/base-files/default/lib/network/config.sh

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

openwrt/package/ppp/files/ppp.sh

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