diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-08 22:48:05 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-08 22:48:05 +0000 |
| commit | b3cd44ba12ba8de347757244666dc1f18add36c2 (patch) | |
| tree | c5abe08fcaa22c2e2b39970c16993e3c3d39e57f /package | |
| parent | d0b622583bb4a200e92c8b487b12295dc7fb88e8 (diff) | |
package/ppp: use new service wrappers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28868 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
| -rw-r--r-- | package/ppp/Makefile | 2 | ||||
| -rw-r--r-- | package/ppp/files/ppp.sh | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index ed692103b..0c40090f1 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 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 \ |