dhcpcd: reimport default config and add timeout 60

the example has some new default options like rapid_commit
also increase the timeout to a minute.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/dhcpc/dhcpcd.conf b/config/dhcpc/dhcpcd.conf
index 7b18896ec56b4fe6ed2493eca650c9f05fa44f12..29f10d1c934ddef9cd7071021a7d325708473647 100644 (file)
--- a/config/dhcpc/dhcpcd.conf
+++ b/config/dhcpc/dhcpcd.conf
@@ -1,26 +1,58 @@
 # A sample configuration for dhcpcd.
 # See dhcpcd.conf(5) for details.
 
+# Allow users of this group to interact with dhcpcd via the control socket.
+#controlgroup wheel
+
 # 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.
+
+# Use the hardware address of the interface for the Client ID.
 #clientid
+# or
+# Use the same DUID + IAID as set in DHCPv6 for DHCPv4 ClientID as per RFC4361.
+# Some non-RFC compliant DHCP servers do not reply with this set.
+# In this case, comment out duid and enable clientid above.
+duid
+
+# Persist interface configuration when dhcpcd exits.
+persistent
+
+# vendorclassid is set to blank to avoid sending the default of
+# dhcpcd-<version>:<os>:<machine>:<platform>
+vendorclassid
 
 # A list of options to request from the DHCP server.
-option domain_name_servers, domain_name, domain_search, host_name
+option domain_name_servers, domain_name, domain_search
 option classless_static_routes
+# Respect the network MTU. This is applied to DHCP routes.
+option interface_mtu
+
+# Request a hostname from the network
+option host_name
+
 # Most distributions have NTP support.
 option ntp_servers
-# Respect the network MTU.
-option interface_mtu
+
+# Rapid commit support.
+# Safe to enable by default because it requires the equivalent option set
+# on the server to actually work.
+option rapid_commit
+
 # A ServerID is required by RFC2131.
 require dhcp_server_identifier
 
+# Generate SLAAC address using the Hardware Address of the interface
+slaac hwaddr
+# OR generate Stable Private IPv6 Addresses based from the DUID
+#slaac private
+
 # 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
 
 # disable ipv4ll (IPv4 local link/apipa) ip's
 noipv4ll
+
+# Increase timeout to 60s
+timeout 60