aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2014-06-17 13:05:24 +0000
committerSteven Barth <cyrus@openwrt.org>2014-06-17 13:05:24 +0000
commitd923104149d82332c0c457bb0a3eaa6d19d61fa9 (patch)
tree4c24c88fdf1746a76fed1448c5c900a460b7b3f1
parent1e989206f4fad18d2deccf82e99e2edc4d9fee69 (diff)
downloadupstream-d923104149d82332c0c457bb0a3eaa6d19d61fa9.tar.gz
upstream-d923104149d82332c0c457bb0a3eaa6d19d61fa9.tar.bz2
upstream-d923104149d82332c0c457bb0a3eaa6d19d61fa9.zip
odhcpd: don't enable relaying by default anymore
SVN-Revision: 41228
-rw-r--r--package/network/services/odhcpd/files/odhcpd.defaults10
1 files changed, 2 insertions, 8 deletions
diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults
index 4d360454a9..d079ec0f80 100644
--- a/package/network/services/odhcpd/files/odhcpd.defaults
+++ b/package/network/services/odhcpd/files/odhcpd.defaults
@@ -7,13 +7,7 @@ set dhcp.odhcpd=odhcpd
set dhcp.odhcpd.maindhcp=0
set dhcp.odhcpd.leasefile=/tmp/hosts/odhcpd
set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
-set dhcp.lan.dhcpv6=hybrid
-set dhcp.lan.ra=hybrid
-set dhcp.lan.ndp=hybrid
-set dhcp.wan6=dhcp
-set dhcp.wan6.dhcpv6=hybrid
-set dhcp.wan6.ra=hybrid
-set dhcp.wan6.ndp=hybrid
-set dhcp.wan6.master=1
+set dhcp.lan.dhcpv6=server
+set dhcp.lan.ra=server
commit dhcp
EOF