Fix block device detection for graphs and other scripts.

diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files
index 409e5fe8ac4e0442392c03e5efbd9d5d44e33c72..c82a52e0871d57c93c23b7e4223a9844a43bea50 100644 (file)
--- a/config/rootfiles/core/56/filelists/files
+++ b/config/rootfiles/core/56/filelists/files
@@ -1,2 +1,7 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/smartenabler
+srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+usr/local/bin/hddshutdown
+usr/local/bin/makegraphs

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index e32f07c25465d9715507cfb39fc575c17325be4f..b0a5d3a36de7d94e506ec5d2f06f5cb13a319029 100644 (file)
--- 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?" || $querry[0] =~ "xvd??" ){
+}elsif ( $querry[0] =~ "sd?" ){
        print "Content-type: image/png\n\n";
        binmode(STDOUT);
        &Graphs::updatehddgraph($querry[0],$querry[1]);
@@ -93,7 +93,7 @@ if ( $querry[0] =~ "hwtemp"){
                &General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
        }
 
-       my @disks = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
+       my @disks = `ls -1 /sys/block | grep -E '^sd' | sort | uniq`;
 
        foreach (@disks){
                my $disk = $_;

diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 9fbb0413230439325cf31c203e79d94102e861d0..f67c1787ad7978dc62d43d6803402093efb34873 100644 (file)
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
 $querry[0] = '' unless defined $querry[0];
 $querry[1] = 'hour' unless defined $querry[1];
 
-my @devices = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
+my @devices = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
 
-if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??"){
+if ( $querry[0] =~ "sd?" || $querry[0] =~ "xvd??" || $querry[0] =~ "vd?" || $querry[0] =~ "md*" ){
        print "Content-type: image/png\n\n";
        binmode(STDOUT);
        

diff --git a/src/initscripts/init.d/smartenabler b/src/initscripts/init.d/smartenabler
index 7344c2f1c61694799f09663da054b47473a1b48e..4df693656fea4877c8459963300713bf6354b929 100644 (file)
--- a/src/initscripts/init.d/smartenabler
+++ b/src/initscripts/init.d/smartenabler
@@ -7,7 +7,7 @@
 case "$1" in
        start)
                boot_mesg -n "Enabling S.M.A.R.T.: ";
-               for disk in `find /sys/block/* -maxdepth 0 ! -name sr* ! -name ram* ! -name loop* -exec basename {} \; | sort | uniq`; do 
+               for disk in `ls -1 /sys/block | grep -E '^sd' | sort | uniq`; do 
                    /usr/sbin/smartctl --smart=on /dev/$disk > /dev/nul;
                    if [ ${?} = 0 ]; then 
                        boot_mesg -n "$SUCCESS$disk$NORMAL ";

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index dc49a17060ab4c509f58b3ab19216c593ec5fddf..146cc73474e57cda8622fd0665841e5390aaee19 100644 (file)
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -22,7 +22,8 @@
 # IPFire HDD Shutdown state reader
 #
 
-my @devices = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | 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;

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 48444f5e188e672e108c8e6a2ccb596520656f64..7cdd2f9bc7a2f5115ea34cf873f7167d33c0d4a4 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -102,7 +102,7 @@ sub updatehdddata{
 ## Update vnstat
 system ('/usr/bin/vnstat -u');
 
-my @disks = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
+my @disks = `ls -1 /sys/block | grep -E '^sd|^xvd|^vd|^md' | sort | uniq`;
 system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus");
 foreach (@disks){
        my $disk = $_;