KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dnsmasq: manage resolv.conf if when listening on 127.0.0.1#53

Browse source 
With this patch the dnsmasq init script manages resolv.conf if and only if
when dnsmasq will listen on 127.0.0.1#53 (is main resolver instance).
Also, resolvfile is now set irrespective of the value of noresolv.

Fixes (partially) FS#785

Signed-off-by: Paul Oranje <por@xs4all.nl>
This commit is contained in:
Paul Oranje 2017-06-09 11:30:23 +02:00 committed by Hans Dedecker
parent 3ff31586eb
commit a53f8ba677
2 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/services/dnsmasq/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq PKG_NAME:=dnsmasq
PKG_VERSION:=2.77 PKG_VERSION:=2.77
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/ PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/

60
package/network/services/dnsmasq/files/dnsmasq.init
View file

@ -707,6 +707,21 @@ dhcp_relay_add() {
fi fi
} }
dnsmasq_ismain()
{
local cfg="$1"
local port notinterfaces
config_get port "$cfg" port "53"
[ $port = "53" ] || return 1
config_get notinterfaces "$cfg" notinterface ""
[ -n $notinterfaces ] && list_contains $notinterfaces "loopback" || return 1
# dnsmasq instance is designated to listen on 127.0.0.1#53.
return 0
}
dnsmasq_start() dnsmasq_start()
{ {
local cfg="$1" disabled resolvfile user_dhcpscript local cfg="$1" disabled resolvfile user_dhcpscript
@ -853,14 +868,10 @@ dnsmasq_start()
[ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile" [ -n "$leasefile" -a \! -e "$leasefile" ] && touch "$leasefile"
config_get_bool cachelocal "$cfg" cachelocal 1 config_get_bool cachelocal "$cfg" cachelocal 1
config_get_bool noresolv "$cfg" noresolv 0 config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto"
if [ "$noresolv" != "1" ]; then xappend "--resolv-file=$resolvfile"
config_get resolvfile "$cfg" resolvfile "/tmp/resolv.conf.auto" # So jail doesn't complain if file missing
# So jail doesn't complain if file missing [ \! -e "$resolvfile" ] && touch "$resolvfile"
[ -n "$resolvfile" -a \! -e "$resolvfile" ] && touch "$resolvfile"
fi
[ -n "$resolvfile" ] && xappend "--resolv-file=$resolvfile"
config_get hostsfile "$cfg" dhcphostsfile config_get hostsfile "$cfg" dhcphostsfile
[ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile" [ -e "$hostsfile" ] && xappend "--dhcp-hostsfile=$hostsfile"
@ -973,16 +984,6 @@ dnsmasq_start()
echo >> $CONFIGFILE_TMP echo >> $CONFIGFILE_TMP
mv -f $CONFIGFILE_TMP $CONFIGFILE mv -f $CONFIGFILE_TMP $CONFIGFILE
[ "$resolvfile" = "/tmp/resolv.conf.auto" ] && {
rm -f /tmp/resolv.conf
[ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
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
done
}
procd_open_instance $cfg procd_open_instance $cfg
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq."${cfg}".pid
@ -1000,20 +1001,29 @@ dnsmasq_start()
procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile
procd_close_instance procd_close_instance
# write /tmp/resolve.conf only for main instance
dnsmasq_ismain $cfg && {
rm -f /tmp/resolv.conf
[ $ADD_LOCAL_DOMAIN -eq 1 ] && [ -n "$DOMAIN" ] && {
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
done
}
} }
dnsmasq_stop() dnsmasq_stop()
{ {
local cfg="$1" local cfg="$1"
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.auto" ] && { dnsmasq_ismain $cfg && {
[ -f /tmp/resolv.conf ] && { [ -f /tmp/resolv.conf ] && rm -f /tmp/resolv.conf
rm -f /tmp/resolv.conf ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
ln -s "$resolvfile" /tmp/resolv.conf
}
} }
rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp rm -f ${BASEDHCPSTAMPFILE}.${cfg}.*.dhcp