From 8ba06a905e2a5d3c03d0dfde392dcfe052cd0371 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Mon, 29 Aug 2011 11:38:31 +0000 Subject: main/rp-pppoe: fixed init script without set/unset ip_forward, added it to post-install script --- main/rp-pppoe/APKBUILD | 13 +++++++------ main/rp-pppoe/rp-pppoe.initd | 3 --- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/main/rp-pppoe/APKBUILD b/main/rp-pppoe/APKBUILD index 0694c2168..54d951364 100644 --- a/main/rp-pppoe/APKBUILD +++ b/main/rp-pppoe/APKBUILD @@ -2,17 +2,19 @@ # Maintainer: Francesco Colista pkgname=rp-pppoe pkgver=3.10 -pkgrel=4 +pkgrel=5 pkgdesc="Roaring Penguin\'s Point-to-Point Protocol over Ethernet client" url="http://www.roaringpenguin.com/pppoe/" arch="all" license="LGPL" depends= makedepends="ppp-dev" -install= +install="rp-pppoe.post-install" subpackages="$pkgname-doc" source="http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz - rp-pppoe.initd" + rp-pppoe.initd + rp-pppoe.post-install + " _builddir="$srcdir"/$pkgname-$pkgver @@ -28,11 +30,10 @@ build() { package() { cd "$_builddir"/src - make DESTDIR="$pkgdir" install - install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } md5sums="d58a13cc4185bca6121a606ff456dec0 rp-pppoe-3.10.tar.gz -851f3a5a2fab28aa3b8999656b565e1c rp-pppoe.initd" +6e98984f57c7b21735a503259b8e700e rp-pppoe.initd +3422d42accacbe33f7ac8ffb6a1e19c8 rp-pppoe.post-install" diff --git a/main/rp-pppoe/rp-pppoe.initd b/main/rp-pppoe/rp-pppoe.initd index 3e6ce3edb..186119996 100644 --- a/main/rp-pppoe/rp-pppoe.initd +++ b/main/rp-pppoe/rp-pppoe.initd @@ -8,14 +8,12 @@ start() { ebegin "Starting PPPOE Server" test -x /usr/sbin/pppoe-server -a -f /etc/ppp/pppoe-server-options || exit 0 start-stop-daemon --start --exec /usr/sbin/pppoe-server -- ${PPPOE_PARAMS} - echo 1 > /proc/sys/net/ipv4/ip_forward eend $? } stop () { ebegin "Stopping PPPOE Server" start-stop-daemon --stop --exec /usr/sbin/pppoe-server - echo 0 > /proc/sys/net/ipv4/ip_forward eend $? } @@ -24,7 +22,6 @@ restart () { start-stop-daemon --stop --exec /usr/sbin/pppoe-server sleep 1 start-stop-daemon --start --exec /usr/sbin/pppoe-server -- ${PPPOE_PARAMS} - echo 1 > /proc/sys/net/ipv4/ip_forward echo "." } -- cgit v1.2.3