webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into arm-port

Browse Source
This commit is contained in:
Arne Fitzenreiter
2011-09-24 13:57:29 +00:00
parent c6d9d18baf 4910586672
commit ff1580d89d
6 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2005-2010 IPFire Team #
# Copyright (C) 2005-2011 IPFire Team #
# #
# 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 #
@@ -93,7 +93,7 @@ if ( $querry[0] =~ "hwtemp"){
&General::writehash("${General::swroot}/sensors/settings", \%sensorsettings);
}
my @disks = `kudzu -qps -c HD 2>/dev/null | grep device: | cut -d" " -f2 | sort | uniq`;
my @disks = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
foreach (@disks){
my $disk = $_;

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

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2008 Michael Tremer & Christian Schmidt #
# 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 #
@@ -45,7 +45,7 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
my @devices = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
if ( $querry[0] =~ "sd?" || $querry[0] =~ "hd?" || $querry[0] =~ "xvd??"){
print "Content-type: image/png\n\n";

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

@@ -7,7 +7,7 @@
case "$1" in
start)
boot_mesg -n "Enabling S.M.A.R.T.: ";
for disk in `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; do
for disk in `find /sys/block/* -maxdepth 0 ! -name sr* ! -name ram* ! -name loop* -exec basename {} \; | sort | uniq`; do
/usr/sbin/smartctl --smart=on /dev/$disk > /dev/nul;
if [ ${?} = 0 ]; then
boot_mesg -n "$SUCCESS$disk$NORMAL ";

2
src/scripts/hddshutdown
View File

@@ -22,7 +22,7 @@
# IPFire HDD Shutdown state reader
#
my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
my @devices = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
my $diskstats = "";
my $newdiskstats = "";
my $debug = 1;

2
src/scripts/makegraphs
View File

@@ -102,7 +102,7 @@ sub updatehdddata{
## Update vnstat
system ('/usr/bin/vnstat -u');
my @disks = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`;
my @disks = `find /sys/block/* -maxdepth 0 ! -name sr* ! -name loop* ! -name ram* -exec basename {} \\; | sort | uniq`;
system("unlink /var/run/hddstatus 2>/dev/null && touch /var/run/hddstatus");
foreach (@disks){
my $disk = $_;

19
src/scripts/scanhd
View File

@@ -1,17 +1,14 @@
#!/bin/bash
case "$1" in
ide)
/sbin/kudzu -qps -c HD | egrep "desc|device:" | awk -F': ' '{print $2}' | sed -e '/"$/a\\' -e "s/$/\;/g" | tr "\n" "XX" | sed -e "s/XX/\n/g" -e "s/\;X/\;/g" | grep '^"' -v > /var/ipfire/extrahd/scan
if [ -e /dev/.mdadm ]; then
echo 'md;"MD Software-Raid";' >> /var/ipfire/extrahd/scan
fi
if [ -e /dev/mmcblk0 ]; then
echo 'mmcblk0;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan
fi
if [ -e /dev/mmcblk1 ]; then
echo 'mmcblk1;"MMC/SD Cardreader";' >> /var/ipfire/extrahd/scan
fi
rm -f /var/ipfire/extrahd/scan
for DEV in `find /sys/block/* -maxdepth 0 ! -name sr* ! -name ram* ! -name loop* -exec basename {} \; | sort | uniq`
do
VENDOR=`cat /sys/block/$DEV/device/vendor 2>/dev/null`
MODEL=`cat /sys/block/$DEV/device/model 2>/dev/null`
REV=`cat /sys/block/$DEV/device/rev 2>/dev/null`
echo "$DEV;$VENDOR $MODEL $REV" >> /var/ipfire/extrahd/scan
done
;;
partitions)
cat /proc/partitions | awk '{print $4 " " $3 }' | grep -v name | grep -v "^[:space:]*$" | \