aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-11-30 10:55:43 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-11-30 10:55:43 +0000
commit5793febde3ca868f4ad7b1ead8ac2c43ae7c4473 (patch)
tree40473277d8da1d14f8972cfe459722cde19e1289 /package/base-files
parent4dd24b1b214936010031bd8ec3b12cf82d85c929 (diff)
downloadmaster-187ad058-5793febde3ca868f4ad7b1ead8ac2c43ae7c4473.tar.gz
master-187ad058-5793febde3ca868f4ad7b1ead8ac2c43ae7c4473.tar.bz2
master-187ad058-5793febde3ca868f4ad7b1ead8ac2c43ae7c4473.zip
base-files: uci-defaults-new: only emit force_link for additional ifaces
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
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/bin/config_generate8
1 files changed, 7 insertions, 1 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index b6675f12ce..6da386faff 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -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
}