dnsmasq: When dhcp-fqdn is set, there must be a domain without an address set as default #8405
Conversation
…ress set as default.
| @@ -33,6 +33,10 @@ dhcp-lease-max={{dnsmasq.dhcp.lease_max}} | |||
| dhcp-fqdn | |||
| {% endif %} | |||
|
|
|||
| {% if dnsmasq.dhcp.domain %} | |||
There was a problem hiding this comment.
we could consider using the default one when not specified, but that's also something we can do later if needed. This is a good addition, thanks!
There was a problem hiding this comment.
I pushed a new commit with a sensible default.
There was a problem hiding this comment.
@Monviech I was thinking more about the firewall's default domain to be honest, just need some trickery for the hint part in that case. kea has something similar for the hostname:
core/src/opnsense/mvc/app/views/OPNsense/Kea/dhcpv4.volt
Lines 30 to 42 in 6b4c987
There was a problem hiding this comment.
Looks cool I try that out. :)
There was a problem hiding this comment.
I've added another commit that adds the same feature.
Edit: I made a mistake there which I still have to fix.
| public function getAction() | ||
| { | ||
| $data = parent::getAction(); | ||
| $data[self::$internalModelName]['dhcp']['domain'] = (string)Config::getInstance()->object()->system->domain; |
There was a problem hiding this comment.
you need to place this into a separate container to prevent the value from being persisted.
There was a problem hiding this comment.
I misunderstood the concept. I have fixed it now.
| @@ -31,7 +31,7 @@ dhcp-lease-max={{dnsmasq.dhcp.lease_max}} | |||
|
|
|||
| {% if dnsmasq.dhcp.fqdn == '1' %} | |||
| dhcp-fqdn | |||
| domain={{dnsmasq.dhcp.domain|default('internal')}} | |||
| domain={{dnsmasq.dhcp.domain}} | |||
There was a problem hiding this comment.
domain={{dnsmasq.dhcp.domain|default(system.hostname)}}
There was a problem hiding this comment.
I've used system.domain instead
…ress set as default (opnsense#8405) * dnsmasq: When dhcp-fqdn is set, there must be a domain without an address set as default
https://thekelleys.org.uk/dnsmasq/docs/dnsmasq-man.html
--dhcp-fqdnTo ensure that all names have a domain part, there must be at least --domain without an address specified when --dhcp-fqdn is set.Fixes the following error: