dnsmasq: add fallback for default dhcpv4/dhcpv6 values

The default dhcpv4/dhcpv6 in odhcpd is disabled.
Add fallback for default values to keep consistency.

Link: https://github.com/openwrt/odhcpd/blob/master/README.md
Ref: https://github.com/openwrt/luci/pull/8642

Signed-off-by: Andy Chiang <AndyChiang_git@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/23445
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index 61dc3967070cc733c70e6bd09e270e04b73b02c9..dd8353a38622578dd5f0036085555158f934ffbc 100755 (executable)
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -575,8 +575,8 @@ dhcp_add() {
        config_get_bool dynamicdhcpv4 "$cfg" dynamicdhcpv4 $dynamicdhcp
        config_get_bool dynamicdhcpv6 "$cfg" dynamicdhcpv6 $dynamicdhcp
 
-       config_get dhcpv4 "$cfg" dhcpv4
-       config_get dhcpv6 "$cfg" dhcpv6
+       config_get dhcpv4 "$cfg" dhcpv4 disabled
+       config_get dhcpv6 "$cfg" dhcpv6 disabled
 
        config_get ra "$cfg" ra
        config_get ra_management "$cfg" ra_management