rpms/munin/devel munin-1.2.6-hddtemp_smartctl-spinup.patch, NONE, 1.1 munin.spec, 1.24, 1.25

[Andreas Thienemann]

Author: ixs

Update of /cvs/pkgs/rpms/munin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19601

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.6-hddtemp_smartctl-spinup.patch 
Log Message:
* Sat Jan 24 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-8
- Updated dependencies to better reflect plugin requirements
- Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices.


munin-1.2.6-hddtemp_smartctl-spinup.patch:

--- NEW FILE munin-1.2.6-hddtemp_smartctl-spinup.patch ---
--- munin-1.2.6/node/node.d/hddtemp_smartctl.in	2009-01-24 15:47:35.000000000 +0100
+++ munin-1.2.6/node/node.d/hddtemp_smartctl.in	2009-01-24 15:48:18.000000000 +0100
@@ -146,8 +146,8 @@
   $fulldev .= 'rdsk/' if $^O eq 'solaris';
   $fulldev .= exists $ENV{'dev_'.$_} ? $ENV{'dev_'.$_} : $dev;
 
-  # Avoid spinning up sleeping disks
-  next if `hdparm -C $fulldev 2>/dev/null` =~ /standby/;
+  # Avoid spinning up sleeping disks only for /dev/sd? or /dev/hd? devices.
+  next if $fulldev =~ /\/dev\/[sh]d?/ && `hdparm -C $fulldev 2>/dev/null` =~ /standby/;
 
   my $cmd = $smartctl.' -A ';
   $cmd .= $ENV{'args_'.$_}.' ' if exists $ENV{'args_'.$_};


Index: munin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/munin/devel/munin.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- munin.spec	24 Jan 2009 14:35:36 -0000	1.24
+++ munin.spec	24 Jan 2009 15:34:31 -0000	1.25
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -19,6 +19,7 @@
 Patch2: munin-1.2.5-nf-conntrack.patch
 Patch3: munin-1.2.5-amp-degree.patch
 Patch4: munin-1.2.6-ntp_offset.patch
+Patch5: munin-1.2.6-hddtemp_smartctl-spinup.patch
 BuildArchitectures: noarch
 Requires: perl-Net-Server perl-Net-SNMP
 Requires: rrdtool
@@ -81,6 +82,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -247,6 +249,10 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Jan 24 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-8
+- Updated dependencies to better reflect plugin requirements
+- Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices.
+
 * Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 1.2.6-7
 - Adjust font requires for new dejavu-sans-mono-fonts name (fixes #480463)