diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-10 10:04:03 +0200 |
commit | db5f9e94c74935ba2d3f3e5267f5184f78303e15 (patch) | |
tree | 5ffa37eab5f2f7a1afa9f4eedc7f05636668f8de /community/radvd | |
parent | 7d166e43d693278dc2585521d147f2b972e8a40c (diff) | |
parent | 223ca251f3ce07eb5484be845e631d6ca645b263 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/erlang/PKGBUILD
community/bird/PKGBUILD
community/chmsee/PKGBUILD
extra/avahi/PKGBUILD
extra/lirc/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/gcc/PKGBUILD
Diffstat (limited to 'community/radvd')
-rw-r--r-- | community/radvd/PKGBUILD | 9 | ||||
-rw-r--r-- | community/radvd/radvd.rc | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 006aaf570..62ec5edea 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67688 2012-03-13 21:44:10Z seblu $ +# $Id: PKGBUILD 69072 2012-04-08 22:59:52Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd pkgver=1.8.5 -pkgrel=2 +pkgrel=3 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -17,10 +17,9 @@ source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.conf" "$pkgname.service") sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d' - '9acb452eede739ca6ce42c9470e8bf258a3dddf4' + 'efe02c38eac45bed065fd48c1e3e7753c90c7c2a' '63ce41d790a0472e6b3b15928f6a71d1dbb7700d' '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d') - build() { cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --with-pidfile=/run/radvd.pid \ @@ -42,7 +41,7 @@ package() { install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname" install -D -m 644 ../$pkgname.service \ - "$pkgdir/lib/systemd/system/$pkgname.service" + "$pkgdir/usr/lib/systemd/system/$pkgname.service" } # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc index fdd9ee8ce..26ad0dbf4 100644 --- a/community/radvd/radvd.rc +++ b/community/radvd/radvd.rc @@ -8,7 +8,10 @@ NAME='IPv6 Router Advertisement Daemon' DAEMON=/usr/sbin/radvd PIDFILE=${PIDFILE:-/run/${0##*/}.pid} DAEMON_OPTS+=("--pidfile=$PIDFILE") -[[ -r "$PIDFILE" ]] && read PID < "$PIDFILE" + +# check pid file +[[ -r "$PIDFILE" ]] && + read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID case "$1" in start) |