From 3118c01c7aac6dd1dbfc789438bbc460de849ed3 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Mon, 5 Jul 2021 10:34:15 +0100 Subject: [PATCH] dnsmasq: source RFC6761 file first Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/dnsmasq/files/dnsmasq.init | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index c8e84e9476..cc0ab57586 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -915,6 +915,12 @@ dnsmasq_start() xappend "--conf-file=${dnsmasqconffile}" } + config_get_bool boguspriv "$cfg" boguspriv 1 + [ "$boguspriv" -gt 0 ] && { + xappend "--bogus-priv" + [ -r "$RFC6761FILE" ] && xappend "--conf-file=$RFC6761FILE" + } + $PROG --version | grep -osqE "^Compile time options:.* DHCPv6( |$)" && DHCPv6CAPABLE=1 || DHCPv6CAPABLE=0 @@ -1187,11 +1193,6 @@ dnsmasq_start() config_foreach filter_dnsmasq mxhost dhcp_mx_add "$cfg" echo >> "$CONFIGFILE_TMP" - config_get_bool boguspriv "$cfg" boguspriv 1 - [ "$boguspriv" -gt 0 ] && { - xappend "--bogus-priv" - [ -r "$RFC6761FILE" ] && xappend "--conf-file=$RFC6761FILE" - } if [ "$DNSMASQ_DHCP_VER" -gt 4 ] ; then # Enable RA feature for when/if it is constructed, -- 2.30.2