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

package/dnsmasq: use new service wrapper

Browse source 
SVN-Revision: 28837
This commit is contained in:
Nicolas Thill 2011-11-07 22:58:45 +00:00
parent e4a8f5abe6
commit 4f5cbf9f9b
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/dnsmasq/Makefile
View file

@ -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

15
package/dnsmasq/files/dnsmasq.init
View file

@ -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
}