summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Zuerker <smiley73@users.sourceforge.net>2011-04-25 08:13:58 -0500
committerPeter Korsgaard <jacmet@sunsite.dk>2011-04-25 20:08:46 +0200
commit648d33d6142329151ca1ef61b50649477574c684 (patch)
treee3db4f666655c9bdb724ed97f5c54fa634b0bee4
parent4bb33dce49245ed36137c7028a9d170d8f4fe8ff (diff)
dhcp: allow IPv6 to be turned on
Signed-off-by: Heiko Zuerker <smiley73@users.sourceforge.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/dhcp/dhcp.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index 64472c9e8..58fd47c8a 100644
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -13,8 +13,11 @@ DHCP_CONF_OPT = \
--with-cli-lease-file=/var/lib/dhcp/dhclient.leases \
--with-srv-pid-file=/var/run/dhcpd.pid \
--with-cli-pid-file=/var/run/dhclient.pid \
- --with-relay-pid-file=/var/run/dhcrelay.pid \
- --disable-dhcpv6
+ --with-relay-pid-file=/var/run/dhcrelay.pid
+
+ifneq ($(BR2_INET_IPV6),y)
+ DHCP_CONF_OPT += --disable-dhcpv6
+endif
ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
define DHCP_INSTALL_SERVER