Load acpi module for button shutdown, event is still missing

Fixed makegraphs to handle disks not in database but returnig value

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1047 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules
index 56fa0420c2f47a0dfbb6fc42bb7e58333e94a244..ec940c1e64bf7a95dfcfc98d732905eb82b5fe8f 100644 (file)
--- a/src/initscripts/sysconfig/modules
+++ b/src/initscripts/sysconfig/modules
@@ -17,5 +17,6 @@
 
 parport_pc
 lp
+button
 
 # End /etc/sysconfig/modules

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 92eba691b5ff1835fb2766c71a7393277f2ff111..6932dec9e732c9ab0b5f68f8070574696613278e 100644 (file)
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -473,7 +473,9 @@ sub updatehdddata
        }
        elsif ( index($hdd_output, "$disk") != -1 )
        {
-           $hdd_output =~ /.*:.*:\s*(\d+).*\s/;
+           my @temp = split(/:/,$hdd_output);
+           $temp[2] =~ s/\D//gi;
+           $temp = $temp[2];
            $temp = $1;
        }
        else