From: Steven Barth <cyrus@openwrt.org>
Date: Tue, 17 Jun 2014 13:05:24 +0000 (+0000)
Subject: odhcpd: don't enable relaying by default anymore
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d923104149d82332c0c457bb0a3eaa6d19d61fa9;p=openwrt%2Fstaging%2Fadrian.git

odhcpd: don't enable relaying by default anymore

SVN-Revision: 41228
---

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