From b3cd44ba12ba8de347757244666dc1f18add36c2 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 8 Nov 2011 22:48:05 +0000
Subject: package/ppp: use new service wrappers

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28868 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/ppp/files/ppp.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'package/ppp/files/ppp.sh')

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 7c789fc98..77f5b0e41 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 \
-- 
cgit v1.2.3