DHCP: Request static_routes from dhcpcd.conf

Rather than being requested by default in the dhcpcd binary.
This matches classless_static_routes.

diff --git a/src/dhcpcd-definitions-small.conf b/src/dhcpcd-definitions-small.conf
index 09bae0008635ee81470d626da39604cdb1ddfad8..2f2312860431dcb810fa2094e54beeb50997f3ad 100644 (file)
--- a/src/dhcpcd-definitions-small.conf
+++ b/src/dhcpcd-definitions-small.conf
@@ -15,7 +15,7 @@ define 12     dname                   host_name
 define 15      array dname             domain_name
 define 26      uint16                  interface_mtu
 define 28      request ipaddress       broadcast_address
 define 15      array dname             domain_name
 define 26      uint16                  interface_mtu
 define 28      request ipaddress       broadcast_address

-define 33      request array ipaddress static_routes
+define 33      array ipaddress         static_routes

 define 50      ipaddress               dhcp_requested_address
 define 51      uint32                  dhcp_lease_time
 define 52      byte                    dhcp_option_overload
 define 50      ipaddress               dhcp_requested_address
 define 51      uint32                  dhcp_lease_time
 define 52      byte                    dhcp_option_overload

diff --git a/src/dhcpcd-definitions.conf b/src/dhcpcd-definitions.conf
index ec36208669bc4e2028a0489c8475eebb5485e9aa..5c9230de2d7f995bd4730bc5ff640eaa0405a9ab 100644 (file)
--- a/src/dhcpcd-definitions.conf
+++ b/src/dhcpcd-definitions.conf
@@ -45,7 +45,7 @@ define 29     byte                    perform_mask_discovery
 define 30      byte                    mask_supplier
 define 31      byte                    router_discovery
 define 32      ipaddress               router_solicitation_address
 define 30      byte                    mask_supplier
 define 31      byte                    router_discovery
 define 32      ipaddress               router_solicitation_address

-define 33      request array ipaddress static_routes
+define 33      array ipaddress         static_routes

 define 34      byte                    trailer_encapsulation
 define 35      uint32                  arp_cache_timeout
 define 36      uint16                  ieee802_3_encapsulation
 define 34      byte                    trailer_encapsulation
 define 35      uint32                  arp_cache_timeout
 define 36      uint16                  ieee802_3_encapsulation

diff --git a/src/dhcpcd.conf b/src/dhcpcd.conf
index 19de37fbea90148cbd8e4435dc1a5c9a1d63bbd6..c8363b333d7721c3278e10dcb14e92046987a4cc 100644 (file)
--- a/src/dhcpcd.conf
+++ b/src/dhcpcd.conf
@@ -24,7 +24,7 @@ vendorclassid
 
 # A list of options to request from the DHCP server.
 option domain_name_servers, domain_name, domain_search
 
 # A list of options to request from the DHCP server.
 option domain_name_servers, domain_name, domain_search

-option classless_static_routes
+option static_routes, classless_static_routes

 # Respect the network MTU. This is applied to DHCP routes.
 option interface_mtu
 
 # Respect the network MTU. This is applied to DHCP routes.
 option interface_mtu