X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9bfe6969387b0dff86c55291bb524af5c4e8a0d4..ec40024c13729034674107632ca48de6771c8eaf:/package/ppp/files/ppp.sh

diff --git a/package/ppp/files/ppp.sh b/package/ppp/files/ppp.sh
index 996d54228..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"
 
@@ -16,6 +17,13 @@ stop_interface_ppp() {
 start_pppd() {
 	local cfg="$1"; shift
 
+	# Workaround for PPPoE service and AC name options,
+	# filter out the nic-* argument and append it as last option
+	local nic=""
+	case "$1" in
+		nic-*) nic="$1"; shift ;;
+	esac
+
 	local proto
 	config_get proto "$cfg" proto
 
@@ -24,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
 	}
@@ -98,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 \
@@ -110,7 +121,8 @@ start_pppd() {
 		${disconnect:+disconnect "$disconnect"} \
 		${ipv6} \
 		${pppd_options} \
-		nodetach
+		nodetach \
+		${nic}
 
 	lock -u "/var/lock/ppp-${link}"
 }