base-files: uci-defaults-new: only emit force_link for additional ifaces
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 30 Nov 2015 10:55:43 +0000 (10:55 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 30 Nov 2015 10:55:43 +0000 (10:55 +0000)
Only se4t the force_link property for non-lan, non-wan ifaces as it is
unnecessary in the default cases.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47675 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/base-files/files/bin/config_generate

index b6675f1..6da386f 100755 (executable)
@@ -49,7 +49,6 @@ generate_network() {
                delete network.$1
                set network.$1='interface'
                set network.$1.ifname='$ifname'
-               set network.$1.force_link=1
                set network.$1.proto='none'
                set network.$1.macaddr='$macaddr'
        EOF
@@ -64,6 +63,7 @@ generate_network() {
                                set network.$1.ip6assign='60'
                        EOF
                ;;
+
                wan)
                        uci -q batch <<-EOF
                                set network.$1.proto='dhcp'
@@ -73,6 +73,12 @@ generate_network() {
                                set network.wan6.proto='dhcpv6'
                        EOF
                ;;
+
+               *)
+                       uci -q batch <<-EOF
+                               set network.$1.force_link=1
+                       EOF
+               ;;
        esac
 }