fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: source RFC6761 file first

Browse Source 
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit a96000cd73d49e22892d1f78bb3e0e1ea599b191)
This commit is contained in:
Kevin Darbyshire-Bryant 2021-07-05 10:34:15 +01:00 committed by ZiMing Mo
parent 9d1a3d939f
commit 7dc9c3cb6d
No known key found for this signature in database
GPG Key ID: 1BED2E3A77AE5ECF
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/network/services/dnsmasq/files/dnsmasq.init
View File

@ -849,6 +849,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
@ -1108,11 +1114,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,