dnsmasq: source RFC6761 file first
authorKevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Mon, 5 Jul 2021 09:34:15 +0000 (10:34 +0100)
committerJo-Philipp Wich <jo@mein.io>
Sun, 26 Jan 2025 13:09:26 +0000 (14:09 +0100)
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
package/network/services/dnsmasq/files/dnsmasq.init

index 4eb2af8354dcd06b9febec7d984279bf8c43a5c5..2249548092cdec966abb4c8bdfa49b753cec3526 100755 (executable)
@@ -914,6 +914,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
 
 
@@ -1186,11 +1192,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,