fix interface enumeration issues related to /var/state/network (thx to fish for debug...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10715 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 611da718cd5cc88d4d60be56b3be4c363d408ef3..d76c4bf9623050fffc3fb710b04b229f1135cc32 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -40,10 +40,11 @@ scan_interfaces() {
                                append interfaces "$CONFIG_SECTION"
                                config_get iftype "$CONFIG_SECTION" type
                                config_get ifname "$CONFIG_SECTION" ifname
-                               config_set "$CONFIG_SECTION" device "$ifname"
+                               config_get device "$CONFIG_SECTION" device
+                               config_set "$CONFIG_SECTION" device "${device:-$ifname}"
                                case "$iftype" in
                                        bridge)
-                                               config_set "$CONFIG_SECTION" ifnames "$ifname"
+                                               config_set "$CONFIG_SECTION" ifnames "${device:-$ifname}"
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                esac
@@ -113,6 +114,15 @@ prepare_interface() {
        return 0
 }
 
+set_interface_ifname() {
+       local config="$1"
+       local ifname="$2"
+
+       config_get device "$1" device
+       uci_set_state "network.$config.ifname=$ifname"
+       uci_set_state "network.$config.device=$device"
+}
+
 setup_interface() {
        local iface="$1"
        local config="$2"
@@ -140,7 +150,7 @@ setup_interface() {
        config_get macaddr "$config" macaddr
        grep "$iface:" /proc/net/dev > /dev/null && \
                $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
-       uci_set_state network "$config" ifname "$iface"
+       set_interface_ifname "$config" "$iface"
 
        pidfile="/var/run/$iface.pid"
        case "$proto" in

diff --git a/package/ppp/files/pppoe.sh b/package/ppp/files/pppoe.sh
index f33d37a1a84a54b7e018d28da82e0db0eb7247d6..e1c9a20cd71b21ff5aa47c82f55a4707591ce317 100644 (file)
--- a/package/ppp/files/pppoe.sh
+++ b/package/ppp/files/pppoe.sh
@@ -13,7 +13,7 @@ setup_interface_pppoe() {
        # make sure the network state references the correct ifname
        scan_ppp "$config"
        config_get ifname "$config" ifname
-       uci set "/var/state/network.$config.ifname=$ifname"
+       set_interface_ifname "$config" "$ifname"
 
        config_get mtu "$cfg" mtu
        mtu=${mtu:-1492}