add protection for bridging interface changes

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

diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/default/lib/network/config.sh
index 3e18db1..18f794a 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 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)
                                case "$iftype" in
                                        bridge)

-                                               config_get ifname "$CONFIG_SECTION" ifname

                                                config_set "$CONFIG_SECTION" ifnames "$ifname"
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;
                                                config_set "$CONFIG_SECTION" ifnames "$ifname"
                                                config_set "$CONFIG_SECTION" ifname br-"$CONFIG_SECTION"
                                        ;;