diff options
author | Sergey Matveychuk <sem@FreeBSD.org> | 2006-01-05 22:10:06 +0000 |
---|---|---|
committer | Sergey Matveychuk <sem@FreeBSD.org> | 2006-01-05 22:10:06 +0000 |
commit | 75dd93c8756540cbe7ee7d706ed424f2cd705899 (patch) | |
tree | b0bd0605449f10f388d2e25d508094de54da74c3 /net-mgmt/cacti/files/patch-fix_df_output | |
parent | Upgrade from 0.8.3 to 0.8.4. Hate <bsd.gnome.mk> (diff) |
- Update tp 0.8.6h
* Numerous bugs fixed
* A few notable features include MySQL 5.x support
* New 5th percentile functionality, and multiple command line scripts
- Refine a little pkg-message.in
Notes
Notes:
svn path=/head/; revision=152839
Diffstat (limited to 'net-mgmt/cacti/files/patch-fix_df_output')
-rw-r--r-- | net-mgmt/cacti/files/patch-fix_df_output | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/net-mgmt/cacti/files/patch-fix_df_output b/net-mgmt/cacti/files/patch-fix_df_output index 705f16930164..8df567b2255f 100644 --- a/net-mgmt/cacti/files/patch-fix_df_output +++ b/net-mgmt/cacti/files/patch-fix_df_output @@ -1,27 +1,9 @@ ---- scripts/diskfree.pl.orig Fri Apr 29 17:32:01 2005 -+++ scripts/diskfree.pl Wed Mar 23 02:19:37 2005 -@@ -1,6 +1,6 @@ +--- scripts/diskfree.pl.orig Wed Jan 4 06:08:30 2006 ++++ scripts/diskfree.pl Fri Jan 6 00:16:58 2006 +@@ -1,5 +1,5 @@ #!/usr/bin/perl - --$ret = `df --block-size=1024 -P $ARGV[0] | grep -v Filesystem`; -+$ret = `df -k $ARGV[0] | grep -v Filesystem`; - $ret =~ s/($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )//; - - print "megabytes:$7 percent:$9"; ---- scripts/diskfree.sh.orig Fri Apr 29 17:32:01 2005 -+++ scripts/diskfree.sh Wed Mar 23 02:19:47 2005 -@@ -1,2 +1,2 @@ - #!/bin/sh --df --block-size=1024 -P $1 | perl -ape '$F[4]=~tr/%//d;}{print "megabytes:$F[3] percent:$F[4]"'; -+df -k $1 | perl -ape '$F[4]=~tr/%//d;}{print "megabytes:$F[3] percent:$F[4]"'; ---- scripts/query_unix_partitions.pl.orig Sat Apr 30 01:50:01 2005 -+++ scripts/query_unix_partitions.pl Sat Apr 30 01:50:13 2005 -@@ -5,7 +5,7 @@ - exit; - } - --open(DF, "/bin/df -P|"); -+open(DF, "/bin/df -k|"); - - while (<DF>) { - #/dev/hda2 20157744 18553884 579860 97% /var +-open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |"); ++open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |"); + foreach (<PROCESS>) { + if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) { + print "megabytes:$7 percent:$9"; |