package/dnsmasq: use new service wrapper

[openwrt/staging/chunkeey.git] / package / dnsmasq / files / dnsmasq.init

diff --git a/package/dnsmasq/files/dnsmasq.init b/package/dnsmasq/files/dnsmasq.init
index a0e893c5fd038ca3014a9c3215ac3f64b297290c..80ab250baa2d11282350bd9fcfc2a467a7eefea4 100644 (file)
--- 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=""
 
@@ -364,6 +367,19 @@ dhcp_srv_add() {
        append args "-W $service"
 }
 
+dhcp_cname_add() {
+       local cfg="$1"
+       local cname target
+
+       config_get cname "$cfg" cname
+       [ -n "$cname" ] || return 0
+
+       config_get target "$cfg" target
+       [ -n "$target" ] || return 0
+
+       append args "--cname=${cname},${target}"
+}
+
 start() {
        include /lib/network
        scan_interfaces
@@ -382,8 +398,9 @@ start() {
        config_foreach dhcp_domain_add domain
        config_foreach dhcp_srv_add srvhost
        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"
@@ -394,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
 }