From 4f5cbf9f9b8e1f8816fd50af98f63b417023fa63 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Mon, 7 Nov 2011 22:58:45 +0000
Subject: [PATCH] package/dnsmasq: use new service wrapper
SVN-Revision: 28837
---
package/dnsmasq/Makefile | 2 +-
package/dnsmasq/files/dnsmasq.init | 15 +++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 540d47689e..1294a8b45f 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
PKG_VERSION:=2.58
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index 3d9060d81d..80ab250baa 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -2,6 +2,9 @@
# Copyright (C) 2007 OpenWrt.org
START=60
+
+SERVICE_USE_PID=1
+
DNS_SERVERS=""
DOMAIN=""
@@ -397,7 +400,7 @@ start() {
config_foreach dhcp_add dhcp
config_foreach dhcp_cname_add cname
- /usr/sbin/dnsmasq $args && {
+ service_start /usr/sbin/dnsmasq $args && {
rm -f /tmp/resolv.conf
[ -n "$DOMAIN" ] && echo "search $DOMAIN" >> /tmp/resolv.conf
DNS_SERVERS="$DNS_SERVERS 127.0.0.1"
@@ -408,10 +411,10 @@ start() {
}
stop() {
- [ -f /tmp/resolv.conf ] && {
- rm -f /tmp/resolv.conf
- ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+ service_stop /usr/sbin/dnsmasq && {
+ [ -f /tmp/resolv.conf ] && {
+ rm -f /tmp/resolv.conf
+ ln -s /tmp/resolv.conf.auto /tmp/resolv.conf
+ }
}
- service_kill dnsmasq /var/run/dnsmasq.pid
- return 0
}
--
GitLab