[arch-commits] Commit in collectd/trunk (PKGBUILD rc.d)
Gaetan Bisson
bisson at nymeria.archlinux.org
Mon May 13 09:53:57 UTC 2013
Date: Monday, May 13, 2013 @ 11:53:57
Author: bisson
Revision: 90576
remove deprecated rc script
Modified:
collectd/trunk/PKGBUILD
Deleted:
collectd/trunk/rc.d
----------+
PKGBUILD | 11 ++++-------
rc.d | 39 ---------------------------------------
2 files changed, 4 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-13 09:53:46 UTC (rev 90575)
+++ PKGBUILD 2013-05-13 09:53:57 UTC (rev 90576)
@@ -40,12 +40,10 @@
source=("${url}files/${pkgname}-${pkgver}.tar.gz"
'libperl.patch'
- 'service'
- 'rc.d')
+ 'service')
sha1sums=('53879095aa51b7dd0b30882b0c9b6ce8c93a8539'
'245c098d121a4a05594553583310953b3a2f6461'
- 'b56907f532b9174e1b6995aadb518228d7464d3b'
- '0f441718d5519cb043b1130e5a1d0379078adbcc')
+ 'b56907f532b9174e1b6995aadb518228d7464d3b')
backup=('etc/collectd.conf')
options=('!libtool')
@@ -63,8 +61,8 @@
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
- --enable-static=no \
- --with-python=/usr/bin/python2
+ --with-python=/usr/bin/python2 \
+ --disable-static
make all
}
@@ -72,7 +70,6 @@
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
rmdir "${pkgdir}/var/run" # FS#30201
- install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service
install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl
}
Deleted: rc.d
===================================================================
--- rc.d 2013-05-13 09:53:46 UTC (rev 90575)
+++ rc.d 2013-05-13 09:53:57 UTC (rev 90576)
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=collectd
-prog="/usr/sbin/collectdmon"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
- stat_busy "Starting $name daemon"
- [[ -z "$PID" ]] && $prog \
- && { add_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-stop)
- stat_busy "Stopping $name daemon"
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-restart)
- $0 stop
- sleep 2
- $0 start
- ;;
-reload)
- stat_busy "Sending SIGHUP to $name daemon"
- [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \
- && { stat_done; } \
- || { stat_fail; exit 1; }
- ;;
-*)
- echo "usage: $0 {start|stop|restart|reload}"
- exit 1
- ;;
-esac
More information about the arch-commits
mailing list