qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:15:00 +02:00
Code

package/ppp: use new service wrappers

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28868 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2011-11-08 22:48:05 +00:00
parent d0b622583b
commit b3cd44ba12
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_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/

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

@ -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 \