This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via a76779bff60174dbde43e8c42d8590a6f1b300c8 (commit) from 26c8fcd7438d9bb22f7f8c13d25c234b954941db (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a76779bff60174dbde43e8c42d8590a6f1b300c8 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Feb 23 21:02:15 2010 +0100

Fix disk (media/hardware) graphs with xen.

-----------------------------------------------------------------------

Summary of changes: config/collectd/collectd.conf | 2 +- html/cgi-bin/hardwaregraphs.cgi | 2 +- html/cgi-bin/media.cgi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

Difference in files: diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index a148b08..07349c8 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -37,7 +37,7 @@ LoadPlugin syslog </Plugin>

<Plugin "disk"> - Disk "/[0-9]$/" + Disk "/[hs]d[a-z][0-9]$/" IgnoreSelected true </Plugin>

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index 16000de..dabdfd1 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -67,7 +67,7 @@ if ( $querry[0] =~ "hwtemp"){ print "Content-type: image/png\n\n"; binmode(STDOUT); &Graphs::updatethermaltempgraph($querry[1]); -}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){ +}elsif ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??" ){ print "Content-type: image/png\n\n"; binmode(STDOUT); &Graphs::updatehddgraph($querry[0],$querry[1]); diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi index 4fe472a..6a89ca8 100644 --- a/html/cgi-bin/media.cgi +++ b/html/cgi-bin/media.cgi @@ -47,7 +47,7 @@ $querry[1] = 'hour' unless defined $querry[1];

my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;

-if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){ +if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??"){ print "Content-type: image/png\n\n"; binmode(STDOUT);

hooks/post-receive -- IPFire 2.x development tree