X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Fscripts%2Fhddshutdown;h=146cc73474e57cda8622fd0665841e5390aaee19;hp=cac546a14a4c78225da3d9cc0292a9c3153482ed;hb=fd24071f657fff2dfa8f878b8eef5d6a1dcf20d8;hpb=51585c70de84487e9a2365547203e2e7f5160de8

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index cac546a14..146cc7347 100644
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -1,57 +1,75 @@
 #!/usr/bin/perl
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 #
 # IPFire HDD Shutdown state reader
 #
-# This code is distributed under the terms of the GPL
-#
-# 20.08.2007 Maniacikarus - IPFire.org - maniacikarus@ipfire.org
-#
-
-# begin
 
-my @proc = `cat /proc/diskstats`;
-my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
-my %diskstatus = "";
+# Also devices that cannot shutdown must be here for mediagraphs.
+my @devices = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
+my $diskstats = "";
+my $newdiskstats = "";
 my $debug = 1;
-my $status = "unknown";
-
-if ( @ARGV[0] eq "state" ){
-my $hdd = @ARGV[1];
-$status = `hdparm -C /dev/$hdd | tail -1 | cut -d: -f2`;
-
-if ( $status=~/standby/){
-  my $ftime = localtime((stat("/tmp/hddshutdown-$hdd"))[9]);
-  print"<B>Disk $hdddev status: <font color=#00FF00>standby</font></B> (since $ftime)";
-  }
-else{
-  print"<B>Disk $hdddev status: <font color=#FF0000>active</font></B>";
-  }
-exit;
-}
-
-if ($debug){print "### Reading Diskstats ###\n";}
-
-foreach (@proc){
-my @line = split(/ +/,$_);
-$diskstatus{$line[3]} =$line[12];
-if ($debug){print "Getting device ".$line[3]." with the following value ".$line[12]."\n";}
-}
+my $status = "";
 
 if ($debug){print "### Searching for available Disks ###\n";}
 
 foreach (@devices){
-chomp $_;
-if ($debug){print "Device ".$_." has ".$diskstatus{$_}." IO Requests.\n";}
-$status = `hdparm -C /dev/$_ | tail -1 | cut -d: -f2`;
+    chomp $_;
+    my @array = split(/\//,$_);
+    $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`;
+    chomp $diskstats;
+    $newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`;
+    chomp $newdiskstats;
+    $status = `hdparm -C /dev/$_ | tail -1 | cut -d: -f2`;
+    chomp $status;
 
-  if ($diskstatus{$_} eq "0" && $status !=~/standby/){
-    if ($debug){print "Device ".$_." is set to standy.\n";}
-    system("/sbin/hdparm -y /dev/$_");
-    system("touch /tmp/hddshutdown-$_");
-  }
-  elsif ($diskstatus{$_} ne "0" || $status !=~/standby/){
-    if ($debug){print "Device ".$_." is active.\n";}
-    if ( -e "/tmp/hddshutdown-$_" ) { system("unlink /tmp/hddshutdown-$_"); }
-  }
+    if ($debug){print "Device ".$_." IDE Power status:".$status."\n";}
+    if (-e "/var/run/hddshutdown-$array[$#array]" && $status !~/standby/)
+    {
+	if ($debug){print "Remove wrong standby marking\n";}
+	if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); } 
+    }
+
+    if ($debug){print "Device ".$_." has ".$newdiskstats." write and read Requests, was ".$diskstats." at last run.\n";}
+    if ($diskstats eq $newdiskstats && (! -e "/var/run/hddshutdown-$array[$#array]") )
+    {
+	if ($debug){print "Setting Device ".$_." to standby ... ";}
+	$status = `hdparm -y /dev/$_ 2>&1`;
+	chomp $status;
+	if ($status !~/Invalid/) 
+	{  
+    	    if ($debug){print "OK\n";}
+	    system("touch /var/run/hddshutdown-$array[$#array]");
+	}
+	else
+	{
+	    if ($debug){print "FAIL\n";}
+	}
+    }
+    if ($diskstats ne $newdiskstats)
+    {
+	if ($debug){print "Device ".$_." is active.\n";}
+	if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); }
+    }
+    system("echo $newdiskstats > /var/run/hddstats-$array[$#array]");
 }
+
 # end