save the real configured interface name in the 'device' variable when running scan_in...

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4983 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 176b9372f426f80454e65fce272a3d684d1467cb..4e5c3041b5db665d7bab807154c000511afcb7a2 100644 (file)
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/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"

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 3e18db1b43b608b138abee3e0e8915977d880dd1..18f794a31b25a1c32d9366983d6d6cfaee30969a 100755 (executable)
--- a/package/base-files/default/lib/network/config.sh
+++ b/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"
                                        ;;

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 51a19555e8bc9e400dd16fd5b6aa44efdd10cd60..343223af1b96e41330242a9e3471cb6dc564eab6 100644 (file)
--- a/package/ppp/files/ppp.sh
+++ b/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"
 }