From eb568e0abac158016c61fae68154722e9d112dfc Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 20 Jun 2018 13:21:28 +0200 Subject: [PATCH] dnsmasq: fix dnsmasq startup issue 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 --- package/network/services/dnsmasq/Makefile | 2 +- package/network/services/dnsmasq/files/dnsmasq.init | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index bb68a67296..f26f819a34 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq PKG_VERSION:=2.80test2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/test-releases diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 4906df9ce4..bb8d07ff35 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1061,18 +1061,10 @@ service_triggers() config_foreach add_interface_trigger dhcp } -boot() -{ - BOOT=1 - start "$@" -} - start_service() { local instance="$1" local instance_found=0 - [ -n "$BOOT" ] && return - . /lib/functions/network.sh config_cb() { -- 2.25.1