packages: munin/munin-plugins.patch - /usr/sbin is not in default PATH

[baggins]

Author: baggins                      Date: Wed Dec 16 12:30:48 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- /usr/sbin is not in default PATH

---- Files affected:
packages/munin:
   munin-plugins.patch (1.34 -> 1.35) 

---- Diffs:

================================================================
Index: packages/munin/munin-plugins.patch
diff -u packages/munin/munin-plugins.patch:1.34 packages/munin/munin-plugins.patch:1.35
--- packages/munin/munin-plugins.patch:1.34	Tue Dec 15 20:45:22 2009
+++ packages/munin/munin-plugins.patch	Wed Dec 16 13:30:43 2009
@@ -1217,3 +1217,86 @@
 +    fi
  done
 -
+--- munin-1.4.0/plugins/node.d/ntp_offset.in~	2009-11-27 12:17:11.000000000 +0100
++++ munin-1.4.0/plugins/node.d/ntp_offset.in	2009-12-16 13:28:05.942149904 +0100
+@@ -38,9 +38,9 @@
+ =cut
+ 
+ do_autoconf () {
+-    ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
++    /usr/sbin/ntpq -c help >/dev/null 2>&1 || { echo 'no (no ntpq program)'; exit 0; }
+     
+-    case "$(ntpq -n -p 2>/dev/null | wc -l)" in
++    case "$(/usr/sbin/ntpq -n -p 2>/dev/null | wc -l)" in
+ 	0)
+             echo 'no (unable to list peers)'
+ 	    exit 0
+@@ -57,7 +57,7 @@
+ }
+ 
+ do_config () {
+-    syspeer="$(ntpq -n -p | grep '^[*o]')"
++    syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
+ 
+     set - $syspeer
+ 
+@@ -89,7 +89,7 @@
+ 
+ do_ () {
+     # Fetch operation
+-    syspeer="$(ntpq -n -p | grep '^[*o]')"
++    syspeer="$(/usr/sbin/ntpq -n -p | grep '^[*o]')"
+ 
+     set - $syspeer
+ 
+--- munin-1.4.0/plugins/node.d/ntp_kernel_err.in~	2009-11-27 12:17:10.000000000 +0100
++++ munin-1.4.0/plugins/node.d/ntp_kernel_err.in	2009-12-16 13:29:00.494146341 +0100
+@@ -33,7 +33,7 @@
+ 
+ if [ "$1" = "autoconf" ]; then
+     # Not all ntpdc's are equal
+-    ntpdc -c kern 2>/dev/null | 
++    /usr/sbin/ntpdc -c kern 2>/dev/null | 
+     awk 'BEGIN { ev=1; }
+          /^estimated error:/ { ev=0; } 
+          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+@@ -51,4 +51,4 @@
+ fi
+ 
+ echo -n 'ntp_err.value '
+-ntpdc -c kern | awk '/^estimated error:/ { print $3 }'
++/usr/sbin/ntpdc -c kern | awk '/^estimated error:/ { print $3 }'
+--- munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in~	2009-12-15 20:45:10.715504269 +0100
++++ munin-1.4.0/plugins/node.d/ntp_kernel_pll_freq.in	2009-12-16 13:29:26.464147058 +0100
+@@ -39,7 +39,7 @@
+ # $Id$
+ 
+ if [ "$1" = "autoconf" ]; then
+-    ntpdc -c kern 2>/dev/null | 
++    /usr/sbin/ntpdc -c kern 2>/dev/null | 
+     awk 'BEGIN { ev=1; }
+          /^pll frequency:/ { ev=0; } 
+          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+@@ -64,4 +64,4 @@
+ fi
+ 
+ echo -n 'ntp_pll_freq.value '
+-ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
++/usr/sbin/ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
+--- munin-1.4.0/plugins/node.d/ntp_kernel_pll_off.in~	2009-11-27 12:17:10.000000000 +0100
++++ munin-1.4.0/plugins/node.d/ntp_kernel_pll_off.in	2009-12-16 13:29:45.228087885 +0100
+@@ -32,7 +32,7 @@
+ # $Id$
+ 
+ if [ "$1" = "autoconf" ]; then
+-    ntpdc -c kern 2>/dev/null | 
++    /usr/sbin/ntpdc -c kern 2>/dev/null | 
+     awk 'BEGIN { ev=1; }
+          /^pll offset:/ { ev=0; } 
+          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
+@@ -50,4 +50,4 @@
+ fi
+ 
+ echo -n 'ntp_pll_off.value '
+-ntpdc -c kern | awk '/^pll offset:/ { print $3 }'
++/usr/sbin/ntpdc -c kern | awk '/^pll offset:/ { print $3 }'
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/munin/munin-plugins.patch?r1=1.34&r2=1.35&f=u