298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

dnsmasq: drop mini_ttl option

Browse Source
This commit is contained in:
coolsnowwolf 2022-12-15 13:13:15 +08:00
parent 8c172cc7bf
commit afb7eaa4bb
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -833,8 +833,6 @@ dnsmasq_start()
append_bool "$cfg" filter_a "--filter-A" append_bool "$cfg" filter_a "--filter-A"
append_parm "$cfg" logfacility "--log-facility" append_parm "$cfg" logfacility "--log-facility"
append_parm "$cfg" mini_ttl "--min-ttl"
append_parm "$cfg" cachesize "--cache-size" append_parm "$cfg" cachesize "--cache-size"
append_parm "$cfg" dnsforwardmax "--dns-forward-max" append_parm "$cfg" dnsforwardmax "--dns-forward-max"
@ -887,7 +885,7 @@ dnsmasq_start()
config_get_bool noresolv "$cfg" noresolv 0 config_get_bool noresolv "$cfg" noresolv 0
if [ "$noresolv" != "1" ]; then if [ "$noresolv" != "1" ]; then
config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.d/resolv.conf.auto.auto" config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.d/resolv.conf.auto"
# So jail doesn't complain if file missing # So jail doesn't complain if file missing
[ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile" [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile"
fi fi
@ -1015,14 +1013,14 @@ dnsmasq_start()
mv -f $CONFIGFILE_TMP $CONFIGFILE mv -f $CONFIGFILE_TMP $CONFIGFILE
mv -f $HOSTFILE_TMP $HOSTFILE mv -f $HOSTFILE_TMP $HOSTFILE
[ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto.auto" ] && { [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && {
rm -f /tmp/resolv.conf.d/resolv.conf.auto rm -f /tmp/resolv.conf
[ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && { [ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
echo "search $DOMAIN" >> /tmp/resolv.conf.d/resolv.conf.auto echo "search $DOMAIN" >> /tmp/resolv.conf
} }
DNS_SERVERS="$DNS_SERVERS 127.0.0.1" DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
for DNS_SERVER in $DNS_SERVERS ; do for DNS_SERVER in $DNS_SERVERS ; do
echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf.d/resolv.conf.auto echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
done done
} }
@ -1046,10 +1044,10 @@ dnsmasq_stop()
config_get resolvfile "$cfg" "resolvfile" config_get resolvfile "$cfg" "resolvfile"
#relink /tmp/resolve.conf only for main instance #relink /tmp/resolve.conf only for main instance
[ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto.auto" ] && { [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && {
[ -f /tmp/resolv.conf.d/resolv.conf.auto ] && { [ -f /tmp/resolv.conf ] && {
rm -f /tmp/resolv.conf.d/resolv.conf.auto rm -f /tmp/resolv.conf
ln -s "$resolvfile" /tmp/resolv.conf.d/resolv.conf.auto ln -s "$resolvfile" /tmp/resolv.conf
} }
} }