Merge branch 'next' into arm-port

diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi
index b0e925439fdfb4c0fc91783a2ee79ee9903f991a..e32f07c25465d9715507cfb39fc575c17325be4f 100644 (file)
--- a/html/cgi-bin/hardwaregraphs.cgi
+++ b/html/cgi-bin/hardwaregraphs.cgi
@@ -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 = $_;

diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 9456c3c220b4072f59435513ba3fe275c88c5be2..9fbb0413230439325cf31c203e79d94102e861d0 100644 (file)
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -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";

diff --git a/src/initscripts/init.d/smartenabler b/src/initscripts/init.d/smartenabler
index 489560bd2c93b95b71041afe5a5e2b683158fa2a..7344c2f1c61694799f09663da054b47473a1b48e 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 `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 ";

diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown
index bb28f830a7b5afd991c61a820a89ca5aaf375f24..dc49a17060ab4c509f58b3ab19216c593ec5fddf 100644 (file)
--- a/src/scripts/hddshutdown
+++ b/src/scripts/hddshutdown
@@ -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;

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 97d086a1057ba05b23599dc716abc30f2ccef21b..48444f5e188e672e108c8e6a2ccb596520656f64 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 = `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 = $_;

diff --git a/src/scripts/scanhd b/src/scripts/scanhd
index 0d97d55303815422d085a877a5447d36707a47f7..f46a630735aaf6f4ad3768794fa77db771b387dd 100644 (file)
--- a/src/scripts/scanhd
+++ b/src/scripts/scanhd
@@ -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:]*$" | \