webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-12 07:31:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix block device detection for graphs and other scripts.

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-01-16 22:22:17 +01:00
parent d520da1704
commit 269e21c662
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/rootfiles/core/56/filelists/files
View File

@@ -1,2 +1,7 @@
etc/system-release etc/system-release
etc/issue 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

4
html/cgi-bin/hardwaregraphs.cgi
View File

@@ -67,7 +67,7 @@ if ( $querry[0] =~ "hwtemp"){
print "Content-type: image/png\n\n"; print "Content-type: image/png\n\n";
binmode(STDOUT); binmode(STDOUT);
&Graphs::updatethermaltempgraph($querry[1]); &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"; print "Content-type: image/png\n\n";
binmode(STDOUT); binmode(STDOUT);
&Graphs::updatehddgraph($querry[0],$querry[1]); &Graphs::updatehddgraph($querry[0],$querry[1]);
@@ -93,7 +93,7 @@ if ( $querry[0] =~ "hwtemp"){
&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings); &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){ foreach (@disks){
my $disk = $_; my $disk = $_;

4
html/cgi-bin/media.cgi
View File

@@ -45,9 +45,9 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0]; $querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1]; $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"; print "Content-type: image/png\n\n";
binmode(STDOUT); binmode(STDOUT);

2
src/initscripts/init.d/smartenabler
View File

@@ -7,7 +7,7 @@
case "$1" in case "$1" in
start) start)
boot_mesg -n "Enabling S.M.A.R.T.: "; 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; /usr/sbin/smartctl --smart=on /dev/$disk > /dev/nul;
if [ ${?} = 0 ]; then if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$disk$NORMAL "; boot_mesg -n "$SUCCESS$disk$NORMAL ";

3
src/scripts/hddshutdown
View File

@@ -22,7 +22,8 @@
# IPFire HDD Shutdown state reader # 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 $diskstats = "";
my $newdiskstats = ""; my $newdiskstats = "";
my $debug = 1; my $debug = 1;

2
src/scripts/makegraphs
View File

@@ -102,7 +102,7 @@ sub updatehdddata{
## Update vnstat ## Update vnstat
system ('/usr/bin/vnstat -u'); 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"); system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus");
foreach (@disks){ foreach (@disks){
my $disk = $_; my $disk = $_;