aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-10-08 13:08:05 +0000
committerSteven Barth <cyrus@openwrt.org>2014-10-08 13:08:05 +0000
commitc118e5edf4301dc303024603dd34d369d9926d6d (patch)
tree563395421170eb286377e375725db125b71ffd14 /package
parentfa5237d9362f96aa4427e959b8bbd98811d8c806 (diff)
downloadupstream-c118e5edf4301dc303024603dd34d369d9926d6d.tar.gz
upstream-c118e5edf4301dc303024603dd34d369d9926d6d.tar.bz2
upstream-c118e5edf4301dc303024603dd34d369d9926d6d.zip
network: Unbind DHCPv6 from underlying interfaces
This allows IPv6 to set up without IPv4 being up thus IPv6-only or IPv6+DS-Lite working with the default config. Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 42848
Diffstat (limited to 'package')
-rwxr-xr-xpackage/base-files/files/bin/config_generate2
-rw-r--r--package/base-files/files/etc/config/network4
-rw-r--r--package/base-files/files/lib/functions/uci-defaults.sh2
3 files changed, 2 insertions, 6 deletions
diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
index 3f60c5b862..9a3b30065d 100755
--- a/package/base-files/files/bin/config_generate
+++ b/package/base-files/files/bin/config_generate
@@ -62,7 +62,7 @@ EOF
set network.$1.proto='dhcp'
delete network.wan6
set network.wan6='interface'
-set network.wan6.ifname='@wan'
+set network.wan6.ifname='$ifname'
set network.wan6.proto='dhcpv6'
EOF
;;
diff --git a/package/base-files/files/etc/config/network b/package/base-files/files/etc/config/network
index 3c9c30a59f..d3cd3c613a 100644
--- a/package/base-files/files/etc/config/network
+++ b/package/base-files/files/etc/config/network
@@ -14,9 +14,5 @@ config interface lan
option netmask 255.255.255.0
option ip6assign 60
-config interface wan6
- option ifname @wan
- option proto dhcpv6
-
config globals globals
option ula_prefix auto
diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
index e90090c40b..798d6baa79 100644
--- a/package/base-files/files/lib/functions/uci-defaults.sh
+++ b/package/base-files/files/lib/functions/uci-defaults.sh
@@ -190,7 +190,7 @@ set network.wan='interface'
set network.wan.ifname='$ifname'
set network.wan.proto='dhcp'
set network.wan6='interface'
-set network.wan6.ifname='@wan'
+set network.wan6.ifname='$ifname'
set network.wan6.proto='dhcpv6'
EOF
}