diff options
author | Aaron Walker <ka0ttic@gentoo.org> | 2005-01-21 19:05:26 +0000 |
---|---|---|
committer | Aaron Walker <ka0ttic@gentoo.org> | 2005-01-21 19:05:26 +0000 |
commit | 638ad478f902da9e366f73456bb2905eb9aa8cb9 (patch) | |
tree | 7df5101be40dc055d85887373a2096e60390e563 /net-analyzer/vnstat | |
parent | Stable on ppc; bug #78712. (diff) | |
download | gentoo-2-638ad478f902da9e366f73456bb2905eb9aa8cb9.tar.gz gentoo-2-638ad478f902da9e366f73456bb2905eb9aa8cb9.tar.bz2 gentoo-2-638ad478f902da9e366f73456bb2905eb9aa8cb9.zip |
Install cron script in /etc/cron.hourly where it belongs, as /etc/cron.d 1) is only supported by vixie, and 2) should contain system crontab entries, not bash scripts. Fixes bug 60711.
(Portage version: 2.0.51-r14)
Diffstat (limited to 'net-analyzer/vnstat')
-rw-r--r-- | net-analyzer/vnstat/ChangeLog | 10 | ||||
-rw-r--r-- | net-analyzer/vnstat/Manifest | 6 | ||||
-rw-r--r-- | net-analyzer/vnstat/files/vnstat.cron | 9 | ||||
-rw-r--r-- | net-analyzer/vnstat/vnstat-1.4.ebuild | 22 |
4 files changed, 33 insertions, 14 deletions
diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog index be50fd8c4448..00ae096c6d6f 100644 --- a/net-analyzer/vnstat/ChangeLog +++ b/net-analyzer/vnstat/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-analyzer/vnstat -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.7 2004/09/29 02:58:04 tgall Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.8 2005/01/21 19:05:26 ka0ttic Exp $ + + 21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> files/vnstat.cron, + vnstat-1.4.ebuild: + Install cron script in /etc/cron.hourly where it belongs, as /etc/cron.d 1) + is only supported by vixie, and 2) should contain system crontab entries, + not bash scripts. Fixes bug 60711. 28 Sep 2004; Tom Gall <tgall@gentoo.org> vnstat-1.4.ebuild: added ~ppc64, bug #64107 diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest index 049c161391b4..0a92c5f59415 100644 --- a/net-analyzer/vnstat/Manifest +++ b/net-analyzer/vnstat/Manifest @@ -1,7 +1,7 @@ -MD5 161dd1b2197f6e822a7977bd65c70d0d ChangeLog 864 +MD5 0dd79c96d783d64ef3aed8999a288fc7 vnstat-1.4.ebuild 1728 +MD5 5d93c47c199408948fad726150943ab2 ChangeLog 1145 MD5 432c6dc3dfd22b4c6657ddcc6c37979e metadata.xml 271 MD5 eb0a408331b471c0ce66781c2cf44ada vnstat-1.1.ebuild 645 -MD5 dc5571b1cba3634d8db25e2077cfbea5 vnstat-1.4.ebuild 1335 +MD5 389e6b2723965358ef9876b4e78d3bfc files/vnstat.cron 220 MD5 afdaa51d96e363c56fe7358b1c5814c5 files/digest-vnstat-1.1 61 MD5 94dd735fdba2070fefd9f85480b1a2b9 files/digest-vnstat-1.4 61 -MD5 c902f7de560cb98f380cf3e6a00ec61f files/vnstat.cron 176 diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron index 9315bcefc5df..690681327688 100644 --- a/net-analyzer/vnstat/files/vnstat.cron +++ b/net-analyzer/vnstat/files/vnstat.cron @@ -1,6 +1,9 @@ #!/bin/bash # run vnstat if installed and at least one database exists -if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then - exec /usr/bin/vnstat -u -fi + +# Uncomment the following to enable + +#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then +# exec /usr/bin/vnstat -u +#fi diff --git a/net-analyzer/vnstat/vnstat-1.4.ebuild b/net-analyzer/vnstat/vnstat-1.4.ebuild index 755c070d4708..7943a52ec95a 100644 --- a/net-analyzer/vnstat/vnstat-1.4.ebuild +++ b/net-analyzer/vnstat/vnstat-1.4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4.ebuild,v 1.8 2004/09/29 02:58:04 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4.ebuild,v 1.9 2005/01/21 19:05:26 ka0ttic Exp $ DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage" HOMEPAGE="http://humdi.net/vnstat/" @@ -21,8 +21,8 @@ src_install() { keepdir /var/lib/vnstat dobin src/vnstat || die - exeinto /etc/cron.d - newexe ${FILESDIR}/vnstat.cron vnstat + exeinto /etc/cron.hourly + doexe ${FILESDIR}/vnstat.cron vnstat doman man/vnstat.1 newdoc pppd/vnstat_ip-down ip-down.example @@ -32,7 +32,7 @@ src_install() { pkg_postinst() { # compatibility for 1.1 ebuild - if [ -d ${ROOT}/var/spool/vnstat ] ; then + if [[ -d ${ROOT}/var/spool/vnstat ]] ; then mv -f ${ROOT}/var/spool/vnstat/* ${ROOT}/var/lib/vnstat \ && rmdir ${ROOT}/var/spool/vnstat einfo "vnStat db files moved from /var/spool/vnstat to /var/lib/vnstat" @@ -41,7 +41,17 @@ pkg_postinst() { einfo "Repeat the following command for every interface you" einfo "wish to monitor (replace eth0):" einfo " vnstat -u -i eth0" - + einfo einfo "Note: if an interface transfers more than ~4GB in" einfo "the time between cron runs, you may miss traffic" + einfo + + if [[ -e ${ROOT}/etc/cron.d/vnstat ]] ; then + einfo "vnstat\'s cron script is now installed as /etc/cron.hourly/vnstat." + einfo "Please remove /etc/cron.d/vnstat." + else + einfo "A cron script has been installed to /etc/cron.hourly/vnstat." + fi + einfo "To update your interface database automatically with" + einfo "cron, uncomment the lines in /etc/cron.hourly/vnstat." } |