diff options
| author | spz <spz@pkgsrc.org> | 2011-11-16 21:12:34 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2011-11-16 21:12:34 +0000 |
| commit | 215bf7c18bf90f274fe8fcbad52fe3a0f202bf8d (patch) | |
| tree | 4e6f82c4df06af498d055d35bdf15361c6efb3c9 /net | |
| parent | fc041c7f81b07d77181b00afe0ec2898922668a9 (diff) | |
| download | pkgsrc-215bf7c18bf90f274fe8fcbad52fe3a0f202bf8d.tar.gz | |
fix bugs found by gendalia@:
- transition from BBHOME etc to XYMONHOME etc needed to also happen
in files/xymon.sh
- vmstat on NetBSD has not shown 3 disks in a while already, so
vmstat trending for NetBSD clients was off. The disk names that
remain are left unchanged since for existing rrds a change would
cause failing data submission
Diffstat (limited to 'net')
| -rw-r--r-- | net/xymon/Makefile | 4 | ||||
| -rw-r--r-- | net/xymon/distinfo | 3 | ||||
| -rw-r--r-- | net/xymon/files/xymon.sh | 6 | ||||
| -rw-r--r-- | net/xymon/patches/patch-xymond_rrd_do__vmstat.c | 27 |
4 files changed, 35 insertions, 5 deletions
diff --git a/net/xymon/Makefile b/net/xymon/Makefile index c639de322f8..30b1550dfa0 100644 --- a/net/xymon/Makefile +++ b/net/xymon/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2011/11/01 06:02:23 sbd Exp $ +# $NetBSD: Makefile,v 1.16 2011/11/16 21:12:34 spz Exp $ # DISTNAME= xymon-4.3.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xymon/} diff --git a/net/xymon/distinfo b/net/xymon/distinfo index 842f398ef31..588e84a3637 100644 --- a/net/xymon/distinfo +++ b/net/xymon/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2011/10/16 15:19:08 spz Exp $ +$NetBSD: distinfo,v 1.7 2011/11/16 21:12:34 spz Exp $ SHA1 (xymon-4.3.5.tar.gz) = cd49d689bbf9c27ed4d2010cf75223d7f43f656e RMD160 (xymon-4.3.5.tar.gz) = 31110454d30835f758d844e3c142066566546548 @@ -13,3 +13,4 @@ SHA1 (patch-ah) = 29942670246f55cf4e703b028cd9a0dcb0acb681 SHA1 (patch-build_rrd.sh) = 6c9393b93265d3c6d5bda801a875ec66f3759b01 SHA1 (patch-build_snmp.sh) = 4141c6e2bebea078ac662b7585e579f2af8ee64f SHA1 (patch-configure) = 7b71ed7a567124a2aa36d9bf9188209649e88a4d +SHA1 (patch-xymond_rrd_do__vmstat.c) = 8062acc24e9b0e767c5abd3373641aa7b9a5b2ae diff --git a/net/xymon/files/xymon.sh b/net/xymon/files/xymon.sh index 24e284cb7de..d2769fd3824 100644 --- a/net/xymon/files/xymon.sh +++ b/net/xymon/files/xymon.sh @@ -27,8 +27,10 @@ command_args="--config=${xymon_launchcfg} --env=${xymon_servercfg} --log=${xymon xymon_precmd() { - HOBBITCLIENTHOME="@BBHOME@/client" - export HOBBITCLIENTHOME + XYMONHOME="@XYMONHOME@" + export XYMONHOME + XYMONCLIENTHOME="@XYMONHOME@/client" + export XYMONCLIENTHOME touch ${xymon_pidfile} && chown ${xymon_user} ${xymon_pidfile} } diff --git a/net/xymon/patches/patch-xymond_rrd_do__vmstat.c b/net/xymon/patches/patch-xymond_rrd_do__vmstat.c new file mode 100644 index 00000000000..a9c8e31ec6f --- /dev/null +++ b/net/xymon/patches/patch-xymond_rrd_do__vmstat.c @@ -0,0 +1,27 @@ +$NetBSD: patch-xymond_rrd_do__vmstat.c,v 1.1 2011/11/16 21:12:35 spz Exp $ + +at least NetBSD 4-5.99 vmstat gives you two disks if you don't specify any, +no matter how many you actually have + +--- xymond/rrd/do_vmstat.c.orig 2011-07-31 21:01:52.000000000 +0000 ++++ xymond/rrd/do_vmstat.c +@@ -154,13 +154,12 @@ static vmstat_layout_t vmstat_netbsd_lay + { 10, "sr" }, + { 11, "dsk_f0" }, + { 12, "dsk_m0" }, +- { 13, "dsk_w0" }, +- { 14, "cpu_int" }, +- { 15, "cpu_syc" }, +- { 16, "cpu_csw" }, +- { 17, "cpu_usr" }, +- { 18, "cpu_sys" }, +- { 19, "cpu_idl" }, ++ { 13, "cpu_int" }, ++ { 14, "cpu_syc" }, ++ { 15, "cpu_csw" }, ++ { 16, "cpu_usr" }, ++ { 17, "cpu_sys" }, ++ { 18, "cpu_idl" }, + { -1, NULL } + }; + |