From afb7eaa4bb0d68151d96f1777313ad28f1b32d90 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 15 Dec 2022 13:13:15 +0800 Subject: [PATCH] dnsmasq: drop mini_ttl option --- .../services/dnsmasq/files/dnsmasq.init | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index b4699147f..317bfbd5d 100755 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -833,8 +833,6 @@ dnsmasq_start() append_bool "$cfg" filter_a "--filter-A" append_parm "$cfg" logfacility "--log-facility" - - append_parm "$cfg" mini_ttl "--min-ttl" append_parm "$cfg" cachesize "--cache-size" append_parm "$cfg" dnsforwardmax "--dns-forward-max" @@ -887,7 +885,7 @@ dnsmasq_start() config_get_bool noresolv "$cfg" noresolv 0 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 [ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile" fi @@ -1015,14 +1013,14 @@ dnsmasq_start() mv -f $CONFIGFILE_TMP $CONFIGFILE mv -f $HOSTFILE_TMP $HOSTFILE - [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto.auto" ] && { - rm -f /tmp/resolv.conf.d/resolv.conf.auto + [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && { + rm -f /tmp/resolv.conf [ $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" 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 } @@ -1046,10 +1044,10 @@ dnsmasq_stop() config_get resolvfile "$cfg" "resolvfile" #relink /tmp/resolve.conf only for main instance - [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto.auto" ] && { - [ -f /tmp/resolv.conf.d/resolv.conf.auto ] && { - rm -f /tmp/resolv.conf.d/resolv.conf.auto - ln -s "$resolvfile" /tmp/resolv.conf.d/resolv.conf.auto + [ "$resolvfile" = "/tmp/resolv.conf.d/resolv.conf.auto" ] && { + [ -f /tmp/resolv.conf ] && { + rm -f /tmp/resolv.conf + ln -s "$resolvfile" /tmp/resolv.conf } }