KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

package/ppp: use new service wrappers

Browse source 
SVN-Revision: 28868
This commit is contained in:
Nicolas Thill 2011-11-08 22:48:05 +00:00
parent ec11af20f6
commit 72de194d16
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/ppp/Makefile
View file

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp PKG_NAME:=ppp
PKG_VERSION:=2.4.5 PKG_VERSION:=2.4.5
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/

12
package/ppp/files/ppp.sh
View file

@ -5,7 +5,8 @@ stop_interface_ppp() {
config_get proto "$cfg" proto config_get proto "$cfg" proto
local link="$proto-$cfg" 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" remove_dns "$cfg"
@ -31,8 +32,8 @@ start_pppd() {
# make sure only one pppd process is started # make sure only one pppd process is started
lock "/var/lock/ppp-${link}" lock "/var/lock/ppp-${link}"
local pid="$(head -n1 /var/run/ppp-${link}.pid 2>/dev/null)" SERVICE_PID_FILE="/var/run/ppp-${link}.pid" \
[ -d "/proc/$pid" ] && grep pppd "/proc/$pid/cmdline" 2>/dev/null >/dev/null && { service_check /usr/sbin/ppd && {
lock -u "/var/lock/ppp-${link}" lock -u "/var/lock/ppp-${link}"
return 0 return 0
} }
@ -105,7 +106,10 @@ start_pppd() {
config_get_bool ipv6 "$cfg" ipv6 0 config_get_bool ipv6 "$cfg" ipv6 0
[ "$ipv6" -eq 1 ] && ipv6="+ipv6" || ipv6="" [ "$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%%[, ]*}} \ ${keepalive:+lcp-echo-interval $interval lcp-echo-failure ${keepalive%%[, ]*}} \
$demandargs \ $demandargs \
$peerdns \ $peerdns \