m/n/core/network: fix mistake in requested DHCP options
This previously requested NameServer (option 5), not DomainNameServer
(option 6), which meant that on DHCP servers only returning explicitly-
requested options we got no DNS servers. While we're in there also add
ClasslessStaticRoutes to the requested options as a hint that we can now
process that option.
Change-Id: I738c33abbf572c2b7da4e36d4a6cae5b971c830c
Reviewed-on: https://review.monogon.dev/c/monogon/+/515
Reviewed-by: Sergiusz Bazanski <serge@monogon.tech>
diff --git a/metropolis/node/core/network/main.go b/metropolis/node/core/network/main.go
index aa7bd84..81a5bfd 100644
--- a/metropolis/node/core/network/main.go
+++ b/metropolis/node/core/network/main.go
@@ -151,7 +151,7 @@
return fmt.Errorf("failed to create DHCP client on interface %v: %w", iface.Attrs().Name, err)
}
s.dhcp.VendorClassIdentifier = "dev.monogon.metropolis.node.v1"
- s.dhcp.RequestedOptions = []dhcpv4.OptionCode{dhcpv4.OptionRouter, dhcpv4.OptionNameServer}
+ s.dhcp.RequestedOptions = []dhcpv4.OptionCode{dhcpv4.OptionRouter, dhcpv4.OptionDomainNameServer, dhcpv4.OptionClasslessStaticRoute}
s.dhcp.LeaseCallback = dhcpcb.Compose(dhcpcb.ManageIP(iface), dhcpcb.ManageRoutes(iface), s.statusCallback)
err = supervisor.Run(ctx, "dhcp", s.dhcp.Run)
if err != nil {