kamailio: fix init script

The init script now correctly uses PID files to kill kamailio on stop.

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>

diff --git a/net/kamailio-3.3.x/Makefile b/net/kamailio-3.3.x/Makefile
index 14291fe241afcd27825d1e5ab89e0580acf4401f..914807178ce016f095780d9b48a000a5c1a9946f 100644 (file)
--- a/net/kamailio-3.3.x/Makefile
+++ b/net/kamailio-3.3.x/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio3
 PKG_VERSION:=3.3.7
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz

diff --git a/net/kamailio-3.3.x/files/kamailio.init b/net/kamailio-3.3.x/files/kamailio.init
index 5a382aeeb58a07db0c65d2cd2739e442e754eb81..dae45464c2b7ee97ff5dd43ef7a90be32c41d119 100644 (file)
--- a/net/kamailio-3.3.x/files/kamailio.init
+++ b/net/kamailio-3.3.x/files/kamailio.init
@@ -1,12 +1,13 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2012 OpenWrt.org
-START=99 
-APP=kamailio
-BIN_FILE="/usr/sbin/"$APP
-PID_FILE="/var/run/"$APP".pid"
+# Copyright (C) 2014 OpenWrt.org
+
+START=99
+
+BIN_FILE=/usr/sbin/kamailio
+PID_FILE=/var/run/kamailio.pid
 
 start() {
-       start-stop-daemon -S -x $BIN_FILE -p $PID_FILE -b -m
+       start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
 }
 
 stop() {

diff --git a/net/kamailio-4.1.x/Makefile b/net/kamailio-4.1.x/Makefile
index 652f68513513ec1ebe5c0518680644926c12ea67..f9a633765059fdf1ea31a2ad6ec6cb5ae5a2b4c1 100644 (file)
--- a/net/kamailio-4.1.x/Makefile
+++ b/net/kamailio-4.1.x/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=kamailio4
 PKG_VERSION:=4.1.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
 PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz

diff --git a/net/kamailio-4.1.x/files/kamailio.init b/net/kamailio-4.1.x/files/kamailio.init
index 5a382aeeb58a07db0c65d2cd2739e442e754eb81..dae45464c2b7ee97ff5dd43ef7a90be32c41d119 100644 (file)
--- a/net/kamailio-4.1.x/files/kamailio.init
+++ b/net/kamailio-4.1.x/files/kamailio.init
@@ -1,12 +1,13 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2012 OpenWrt.org
-START=99 
-APP=kamailio
-BIN_FILE="/usr/sbin/"$APP
-PID_FILE="/var/run/"$APP".pid"
+# Copyright (C) 2014 OpenWrt.org
+
+START=99
+
+BIN_FILE=/usr/sbin/kamailio
+PID_FILE=/var/run/kamailio.pid
 
 start() {
-       start-stop-daemon -S -x $BIN_FILE -p $PID_FILE -b -m
+       start-stop-daemon -S -x $BIN_FILE -b -- -P $PID_FILE
 }
 
 stop() {