summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slachta2014-10-26 21:33:23 +0000
committerJiri Slachta2014-10-26 21:33:23 +0000
commit636f71a677448e135443f928c10a1c833ce4b2b5 (patch)
treeb1f254d4c5626c573afe9eaf3ae66581cd603915
parent99f11a8320be75cb9d569bef62659ada2cd71cdf (diff)
downloadtelephony-636f71a677448e135443f928c10a1c833ce4b2b5.tar.gz
kamailio: fix init script, closing #18201
The init script now correctly uses PID files to kill kamailio on stop. Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
-rw-r--r--net/kamailio-3.3.x/Makefile2
-rw-r--r--net/kamailio-3.3.x/files/kamailio.init13
-rw-r--r--net/kamailio-4.1.x/Makefile2
-rw-r--r--net/kamailio-4.1.x/files/kamailio.init13
4 files changed, 16 insertions, 14 deletions
diff --git a/net/kamailio-3.3.x/Makefile b/net/kamailio-3.3.x/Makefile
index 14291fe..9148071 100644
--- 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 5a382ae..dae4546 100644
--- 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 fcb845c..a8c6ea4 100644
--- 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.5
-PKG_RELEASE:=3
+PKG_RELEASE:=4
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 5a382ae..dae4546 100644
--- 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() {