From f59b59db965b4322c89cd9cf1e6e720d15edd322 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 2 Dec 2015 14:39:19 +0100
Subject: [PATCH] dhcpcd: revert dhclient config before core91.

the new config has some ipv6 defaults that conflict with
t-com entertain.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/dhcpc/dhcpcd.conf                 | 23 +++++++++++++++++++++++
 config/rootfiles/core/95/filelists/files |  1 +
 lfs/dhcpcd                               |  3 +++
 3 files changed, 27 insertions(+)
 create mode 100644 config/dhcpc/dhcpcd.conf

diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf
new file mode 100644
index 000000000..eb625a70c
--- /dev/null
+++ b/config/dhcpc/dhcpcd.conf
@@ -0,0 +1,23 @@
+# A sample configuration for dhcpcd.
+# See dhcpcd.conf(5) for details.
+
+# Inform the DHCP server of our hostname for DDNS.
+hostname
+# To share the DHCP lease across OSX and Windows a ClientID is needed.
+# Enabling this may get a different lease than the kernel DHCP client.
+# Some upstream DHCP servers may also require a ClientID, such as FRITZ!Box.
+#clientid
+
+# A list of options to request from the DHCP server.
+option domain_name_servers, domain_name, domain_search, host_name
+option classless_static_routes
+# Most distributions have NTP support.
+option ntp_servers
+# Respect the network MTU.
+option interface_mtu
+# A ServerID is required by RFC2131.
+require dhcp_server_identifier
+
+# A hook script is provided to lookup the hostname if not set by the DHCP
+# server, but it should not be run by default.
+nohook lookup-hostname
diff --git a/config/rootfiles/core/95/filelists/files b/config/rootfiles/core/95/filelists/files
index 28c9e8e09..2c458a14c 100644
--- a/config/rootfiles/core/95/filelists/files
+++ b/config/rootfiles/core/95/filelists/files
@@ -22,5 +22,6 @@ usr/local/bin/ipsecctrl
 usr/local/bin/settime
 usr/local/bin/timecheck
 var/ipfire/backup/exclude
+var/ipfire/dhcpc/dhcpcd.conf
 var/ipfire/langs
 var/ipfire/network-functions.pl
diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index e73d99c65..ff31821f6 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -87,5 +87,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	sed -i -e "s|-ge 576|-gt 576|g" $(CONFIG_ROOT)/dhcpc/dhcpcd-hooks/10-mtu
 
+	install -m 644 $(DIR_SRC)/config/dhcpc/dhcpcd.conf $(CONFIG_ROOT)/dhcpc/
+	chown root:root $(CONFIG_ROOT)/dhcpc/dhcpcd.conf
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
-- 
2.39.2