die fehlenden Anpassungen fuer die komischen Devicenamen

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@955 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index ee200ce0df045d63ec3819987156104eb508bd97..b2c9408d84e294828ac0d89a1aa3726a146f291f 100644 (file)
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -46,7 +46,8 @@ my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
 foreach (@disks){
   my $disk = $_;
   chomp $disk;
-  &Graphs::updatehddgraph ($disk,"day");&Graphs::updatehddgraph ($disk,"week");&Graphs::updatehddgraph ($disk,"month");&Graphs::updatehddgraph ($disk,"year");
+  my @array = split(/\//,$disk);
+  &Graphs::updatehddgraph ($array[$#array],"day");&Graphs::updatehddgraph ($array[$#array],"week");&Graphs::updatehddgraph ($array[$#array],"month");&Graphs::updatehddgraph ($array[$#array],"year");
 }
 
   &Graphs::updatetempgraph ("day");
@@ -256,7 +257,8 @@ else
     foreach (@devices) {
           my $device = $_;
           chomp($device);
-    hddtempbox($device);}
+          my @array = split(/\//,$device);
+    hddtempbox($array[$#array]);}
   }
 
   &Header::openbox('100%', 'center', $Lang::tr{'settings'});
@@ -312,7 +314,7 @@ sub hddtempbox {
  my $disk = $_[0];
     if (-e "$graphdir/hddtemp-$disk-day.png") {
   
-         &Header::openbox('100%', 'center', "Disk /dev/$disk $Lang::tr{'graph'}");
+         &Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
          my $ftime = localtime((stat("$graphdir/hddtemp-$disk-day.png"))[9]);
          print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
          print "<a href='/cgi-bin/hardwaregraphs.cgi?graph=hddtemp-$disk'>";

diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index be02f489dd8f9da7b8487b16145d09f0f53f3dc2..1eacb34286496410bdd0602c45be3a827daeaf51 100644 (file)
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -49,8 +49,9 @@ my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
 foreach (@devices) {
        my $device = $_;
        chomp($device);
-       &Graphs::updatediskgraph ("day",$device);
-       diskbox("$device");
+       my @array = split(/\//,$device);
+       &Graphs::updatediskgraph ("day",$array[$#array]);
+       diskbox($array[$#array]);
 }
 
 &Header::openbox('100%', 'center', $Lang::tr{'disk usage'});
@@ -187,7 +188,7 @@ sub diskbox {
  chomp $disk;
  my @status;
     if (-e "$Header::graphdir/disk-$disk-day.png") {
-                 &Header::openbox('100%', 'center', "Disk /dev/$disk $Lang::tr{'graph'}");
+                 &Header::openbox('100%', 'center', "Disk $disk $Lang::tr{'graph'}");
                  my $ftime = localtime((stat("$Header::graphdir/disk-$disk-day.png"))[9]);
                  print "<center><b>$Lang::tr{'the statistics were last updated at'}: $ftime</b></center><br />\n";
                  print "<a href='/cgi-bin/graphs.cgi?graph=disk-$disk'>";
@@ -206,10 +207,10 @@ sub diskbox {
 
         if ( $status[1]=~/standby/){
           my $ftime = localtime((stat("/tmp/hddshutdown-$disk"))[9]);
-          print"<B>Disk /dev/$disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
+          print"<B>Disk $disk status:<font color=#FF0000>".$status[1]."</font></B> (since $ftime)";
         }
         else{
-          print"<B>Disk /dev/$disk status:<font color=#00FF00>".$status[1]."</font></B>";
+          print"<B>Disk $disk status:<font color=#00FF00>".$status[1]."</font></B>";
         }
       }
                  my $smart = `/usr/local/bin/smartctrl $disk`;

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index 1a7a1d56f2e05b84822f7285401d6b59418c275a..056adf37545d03ded376d95a7b601c028c06ee0d 100644 (file)
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -19,7 +19,8 @@ if ($debug){print "### Searching for available Disks ###\n";}
 
 foreach (@devices){
     chomp $_;
-    $diskstats = `cat /tmp/hddstats-$_`;
+    my @array = split(/\//,$_);
+    $diskstats = `cat /tmp/hddstats-$array[$#array]`;
     chomp $diskstats;
     $newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
     chomp $newdiskstats;
@@ -27,34 +28,34 @@ foreach (@devices){
     chomp $status;
 
     if ($debug){print "Device ".$_." IDE Power status:".$status."\n";}
-    if (-e "/tmp/hddshutdown-$_" && $status !~/standby/)
+    if (-e "/tmp/hddshutdown-$array[$#array]" && $status !~/standby/)
     {
        if ($debug){print "Remove wrong standby marking\n";}
-       if ( -e "/tmp/hddshutdown-$_" ) { system("unlink /tmp/hddshutdown-$_"); } 
+       if ( -e "/tmp/hddshutdown-$array[$#array]" ) { system("unlink /tmp/hddshutdown-$array[$#array]"); } 
     }
 
     if ($debug){print "Device ".$_." has ".$newdiskstats." write and read Requests, was ".$diskstats." at last run.\n";}
-    if ($diskstats eq $newdiskstats && (! -e "/tmp/hddshutdown-$_") )
+    if ($diskstats eq $newdiskstats && (! -e "/tmp/hddshutdown-$array[$#array]") )
     {
        if ($debug){print "Setting Device ".$_." to standby ... ";}
        $status = `hdparm -y /dev/$_ 2>&1`;
        chomp $status;
-       if ($status !~/failed/) 
+       if ($status !~/Invalid/) 
        {  
            if ($debug){print "OK\n";}
-           system("touch /tmp/hddshutdown-$_");
+           system("touch /tmp/hddshutdown-$array[$#array]");
        }
        else
        {
-           if ($debug){print "FAIL\n";}         
+           if ($debug){print "FAIL\n";}
        }
     }
     if ($diskstats ne $newdiskstats)
     {
        if ($debug){print "Device ".$_." is active.\n";}
-       if ( -e "/tmp/hddshutdown-$_" ) { system("unlink /tmp/hddshutdown-$_"); }
+       if ( -e "/tmp/hddshutdown-$array[$#array]" ) { system("unlink /tmp/hddshutdown-$array[$#array]"); }
     }
-    system("echo $newdiskstats > /tmp/hddstats-$_");
+    system("echo $newdiskstats > /tmp/hddstats-$array[$#array]");
 }
 
 # end