dhcpcd.conf: harden default options

Don't send the current hostname.
Don't send the default vendorclassid.
Slight re-org while here.

diff --git a/src/dhcpcd.conf b/src/dhcpcd.conf
index 537ed77b3bdce5dd8b93e57e485c8888ecbec523..916e82dae1e73022e13dc6caababbbb1b6d62e2c 100644 (file)
--- a/src/dhcpcd.conf
+++ b/src/dhcpcd.conf
@@ -5,7 +5,7 @@
 #controlgroup wheel
 
 # Inform the DHCP server of our hostname for DDNS.
-hostname
+#hostname
 
 # Use the hardware address of the interface for the Client ID.
 #clientid
@@ -18,20 +18,27 @@ duid
 # Persist interface configuration when dhcpcd exits.
 persistent
 
-# Rapid commit support.
-# Safe to enable by default because it requires the equivalent option set
-# on the server to actually work.
-option rapid_commit
+# 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
 
+# 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