Merge branch 'next' of git://git.ipfire.org/ipfire-2.x into next

[people/teissler/ipfire-2.x.git] / html / cgi-bin / media.cgi

diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 4fe472a029f5c0002c57ec7eb5313b90dfe082b7..9456c3c220b4072f59435513ba3fe275c88c5be2 100644 (file)
--- 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);
        
@@ -70,7 +70,7 @@ if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" ){
        
        &Header::openbox('100%', 'center', $Lang::tr{'disk usage'});
        print "<table width='95%' cellspacing='5'>\n";
-       open(DF,'/bin/df -B M -x rootfs|');
+       open(DF,'/bin/df -P -B M -x rootfs|');
        while(<DF>){
                if ($_ =~ m/^Filesystem/ ){
                        print <<END
@@ -108,7 +108,7 @@ END
        close DF;
        print "<tr><td colspan='7'>&nbsp;\n<tr><td colspan='7'><h3>Inodes</h3>\n";
 
-       open(DF,'/bin/df -i -x rootfs|');
+       open(DF,'/bin/df -P -i -x rootfs|');
        while(<DF>){
                if ($_ =~ m/^Filesystem/ ){
                        print <<END