[packages_10.03.2] stun: merge r29095, r29199

[10.03/packages.git] / net / stun / files / stund.init

diff --git a/net/stun/files/stund.init b/net/stun/files/stund.init
index 177ae58..1deada4 100644 (file)
--- a/net/stun/files/stund.init
+++ b/net/stun/files/stund.init
@@ -3,26 +3,28 @@
 
 START=70
 
+SERVICE_DAEMONIZE=1
+SERVICE_WRITE_PID=1
+
 start() {
        local pri_ip sec_ip pri_port sec_port
+
        parse_opts() {
                local cfg="$1"
-               config_get pri_ip   "$cfg" primaryip
-               config_get sec_ip   "$cfg" secondaryip
-               config_get pri_port "$cfg" primaryport
-               config_get sec_port "$cfg" secondaryport
+               config_get pri_ip   "$cfg" 'primaryip'
+               config_get sec_ip   "$cfg" 'secondaryip'
+               config_get pri_port "$cfg" 'primaryport'
+               config_get sec_port "$cfg" 'secondaryport'
        }
 
-       config_load "stund"
+       config_load 'stund'
        config_foreach parse_opts
 
-       start-stop-daemon -S -p /var/run/stund.pid -m -b \
-               -x /usr/sbin/stund -- \
+       service_start /usr/sbin/stund \
                ${pri_ip:+-h $pri_ip} ${sec_ip:+-a $sec_ip} \
                ${pri_port:+-p $pri_port} ${sec_port:+-o $sec_port}
 }
 
 stop() {
-       service_kill stund /var/run/stund.pid
-       rm -f /var/run/stund.pid
+       service_stop /usr/sbin/stund
 }