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

dnsmasq: fix dnsmasq startup issue

Browse source 
Commit ecd954d530 installs specific interface triggers which rewrites the dnsmasq config
file and restarts dnsmasq if the network interface becomes active for which a trigger
has been installed.
In case no dhcp sections are specified or ignore is set to 1 dnsmasq will not be started
at startup which breaks DNS resolving.
Fix this by ditching the BOOT check in start_service and always start dnsmasq at startup.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
This commit is contained in:
Hans Dedecker 2018-06-20 13:21:28 +02:00
parent 969fe206bd
commit 0e84393ee2
2 changed files with 1 additions and 9 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.80test2 PKG_VERSION:=2.80test2
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases

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

@ -1061,18 +1061,10 @@ service_triggers()
config_foreach add_interface_trigger dhcp config_foreach add_interface_trigger dhcp
} }
boot()
{
BOOT=1
start "$@"
}
start_service() { start_service() {
local instance="$1" local instance="$1"
local instance_found=0 local instance_found=0
[ -n "$BOOT" ] && return
. /lib/functions/network.sh . /lib/functions/network.sh
config_cb() { config_cb() {