X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fscripts%2Fhddshutdown;h=146cc73474e57cda8622fd0665841e5390aaee19;hb=b9d51680a64a7da279807b1d9901e206749db97f;hp=056adf37545d03ded376d95a7b601c028c06ee0d;hpb=5384809bf8c50e5e06e7b001dd92d584ab0cce2d;p=ipfire-2.x.git

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index 056adf3754..146cc73474 100644
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -1,15 +1,29 @@
 #!/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
-#
-# 18.09.2007 Maniacikarus - IPFire.org - maniacikarus@ipfire.org
-# 22.09.2007 Arne_F -  fitzenreiter.de - arne@fitzenreiter.de
-
-# begin
 
-my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
+# 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;
@@ -20,7 +34,7 @@ if ($debug){print "### Searching for available Disks ###\n";}
 foreach (@devices){
     chomp $_;
     my @array = split(/\//,$_);
-    $diskstats = `cat /tmp/hddstats-$array[$#array]`;
+    $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;
@@ -28,14 +42,14 @@ foreach (@devices){
     chomp $status;
 
     if ($debug){print "Device ".$_." IDE Power status:".$status."\n";}
-    if (-e "/tmp/hddshutdown-$array[$#array]" && $status !~/standby/)
+    if (-e "/var/run/hddshutdown-$array[$#array]" && $status !~/standby/)
     {
 	if ($debug){print "Remove wrong standby marking\n";}
-	if ( -e "/tmp/hddshutdown-$array[$#array]" ) { system("unlink /tmp/hddshutdown-$array[$#array]"); } 
+	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 "/tmp/hddshutdown-$array[$#array]") )
+    if ($diskstats eq $newdiskstats && (! -e "/var/run/hddshutdown-$array[$#array]") )
     {
 	if ($debug){print "Setting Device ".$_." to standby ... ";}
 	$status = `hdparm -y /dev/$_ 2>&1`;
@@ -43,7 +57,7 @@ foreach (@devices){
 	if ($status !~/Invalid/) 
 	{  
     	    if ($debug){print "OK\n";}
-    	    system("touch /tmp/hddshutdown-$array[$#array]");
+	    system("touch /var/run/hddshutdown-$array[$#array]");
 	}
 	else
 	{
@@ -53,9 +67,9 @@ foreach (@devices){
     if ($diskstats ne $newdiskstats)
     {
 	if ($debug){print "Device ".$_." is active.\n";}
-	if ( -e "/tmp/hddshutdown-$array[$#array]" ) { system("unlink /tmp/hddshutdown-$array[$#array]"); }
+	if ( -e "/var/run/hddshutdown-$array[$#array]" ) { system("unlink /var/run/hddshutdown-$array[$#array]"); }
     }
-    system("echo $newdiskstats > /tmp/hddstats-$array[$#array]");
+    system("echo $newdiskstats > /var/run/hddstats-$array[$#array]");
 }
 
 # end