diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2018-06-20 13:21:28 +0200 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-06-20 14:07:19 +0200 |
| commit | 0e84393ee27bc2c209863a0a006dea8b716cfb11 (patch) | |
| tree | 0f134ed6b1410e00e50e5fdad23c9bdfaf44b593 | |
| parent | 969fe206bdb910789bebd064d4b3be00238b0012 (diff) | |
| download | upstream-0e84393ee27bc2c209863a0a006dea8b716cfb11.tar.gz upstream-0e84393ee27bc2c209863a0a006dea8b716cfb11.tar.bz2 upstream-0e84393ee27bc2c209863a0a006dea8b716cfb11.zip | |
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 <dedeckeh@gmail.com>
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 2 | ||||
| -rw-r--r-- | package/network/services/dnsmasq/files/dnsmasq.init | 8 |
2 files changed, 1 insertions, 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() { |