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>

diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf
new file mode 100644 (file)
index 0000000..eb625a7
--- /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 28c9e8e09c435a706f36b3f60894bf15302a064e..2c458a14c325b7ae4f575aa1cab4a99c2f489fce 100644 (file)
--- 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 e73d99c653f3f3f07cd77175949a8aeddec431c4..ff31821f60af3d3b9f144b46e1016a856abcfeea 100644 (file)
--- 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)