rpms/munin/EL-5 munin-1.2.6-hddtemp_smartctl-spinup.patch, NONE, 1.1 munin.spec, 1.14, 1.15

[Andreas Thienemann]

Author: ixs

Update of /cvs/pkgs/rpms/munin/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10995/EL-5

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.6-hddtemp_smartctl-spinup.patch 
Log Message:
* Wed Feb 18 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-4
- 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/EL-5/munin.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- munin.spec	22 Jan 2009 21:10:20 -0000	1.14
+++ munin.spec	18 Feb 2009 14:12:48 -0000	1.15
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPLv2 and Bitstream Vera
 Group:     System Environment/Daemons
@@ -19,10 +19,12 @@
 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
 Requires: logrotate
+Requires: /bin/mail
 Requires(pre): shadow-utils
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -45,7 +47,7 @@
 BuildArchitectures: noarch
 Requires: perl-Net-Server
 Requires: procps >= 2.0.7
-Requires: sysstat
+Requires: sysstat, /usr/bin/which, hdparm
 Requires(pre): shadow-utils
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -79,6 +81,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 
@@ -241,6 +244,10 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Wed Feb 18 2009 Andreas Thienemann <andreas at bawue.net> - 1.2.6-4
+- Updated dependencies to better reflect plugin requirements
+- Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices.
+
 * Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 1.2.6-3
 - Move Munin/Plugin.pm to the node subpackage (fixes #457403)