From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 8 Nov 2011 22:48:05 +0000 (+0000)
Subject: package/ppp: use new service wrappers
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=72de194d1633e52b4000d9021e35a30716cfb21a;p=openwrt%2Fstaging%2Fansuel.git

package/ppp: use new service wrappers

SVN-Revision: 28868
---

diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index ed692103b4..0c40090f12 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/
diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 7c789fc983..77f5b0e41d 100644
--- a/package/ppp/files/ppp.sh
+++ b/package/ppp/files/ppp.sh
@@ -5,7 +5,8 @@ stop_interface_ppp() {
 	config_get proto "$cfg" proto
 
 	local link="$proto-$cfg"
-	service_kill pppd "/var/run/ppp-${link}.pid"
+	SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
+	service_stop /usr/sbin/pppd
 
 	remove_dns "$cfg"
 
@@ -31,8 +32,8 @@ start_pppd() {
 
 	# make sure only one pppd process is started
 	lock "/var/lock/ppp-${link}"
-	local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)"
-	[ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && {
+	SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
+	service_check /usr/sbin/ppd && {
 		lock -u "/var/lock/ppp-${link}"
 		return 0
 	}
@@ -105,7 +106,10 @@ start_pppd() {
 	config_get_bool ipv6 "$cfg" ipv6 0
 	[ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6=""
 
-	start-stop-daemon -S -b -x /usr/sbin/pppd -m -p /var/run/ppp-$link.pid -- "$@" \
+	SERVICE_DAEMONIZE=1 \
+	SERVICE_WRITE_PID=1 \
+	SERVICE_PID_FILE="/var/run/ppp-$link.pid" \
+	service_start /usr/sbin/pppd "$@" \
 		${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
 		$demandargs \
 		$peerdns \