aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/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
commita826098e2bd2af77a11b2413b8afdea230de748a (patch)
tree4da5b435962120780cd97b1da490d1f01343cf8b /package/base-files/files
parentfff1a8218099a95ebee2042708c1ec8805bede7d (diff)
downloadupstream-a826098e2bd2af77a11b2413b8afdea230de748a.tar.gz
upstream-a826098e2bd2af77a11b2413b8afdea230de748a.tar.bz2
upstream-a826098e2bd2af77a11b2413b8afdea230de748a.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> SVN-Revision: 47675
Diffstat (limited to 'package/base-files/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
}