From 1e761c34d284684f13aaf665852b48692b8ac9f2 Mon Sep 17 00:00:00 2001 From: Andreas Thienemann Date: Jan 24 2009 15:34:31 +0000 Subject: - Updated dependencies to better reflect plugin requirements - Added hddtemp_smartctl patch to only scan for standby state on /dev/[sh]d? devices. --- diff --git a/munin-1.2.6-hddtemp_smartctl-spinup.patch b/munin-1.2.6-hddtemp_smartctl-spinup.patch new file mode 100644 index 0000000..1d9d0bb --- /dev/null +++ b/munin-1.2.6-hddtemp_smartctl-spinup.patch @@ -0,0 +1,13 @@ +--- 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_'.$_}; diff --git a/munin.spec b/munin.spec index a954148..809934a 100644 --- a/munin.spec +++ b/munin.spec @@ -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 @@ Patch1: munin-1.2.4-conf.patch 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 @@ RRDtool. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -247,6 +249,10 @@ exit 0 %doc %{_mandir}/man5/munin-node* %changelog +* Sat Jan 24 2009 Andreas Thienemann - 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 - 1.2.6-7 - Adjust font requires for new dejavu-sans-mono-fonts name (fixes #480463)