View | Details | Raw Unified | Return to bug 155109
Collapse All | Expand All

(-)munin-node/files/patch-node-node.d.freebsd-coretemp.diff (-3 / +12 lines)
Lines 1-11 Link Here
1 
--- ./plugins/node.d.freebsd/coretemp.in.orig	2011-02-14 23:51:14.000000000 +0100
 1 
--- ./plugins/node.d.freebsd/coretemp.in.orig	2009-04-01 14:24:27.000000000 +0200
2 
+++ ./plugins/node.d.freebsd/coretemp.in	2011-02-14 23:52:10.000000000 +0100
 2 
+++ ./plugins/node.d.freebsd/coretemp.in	2011-02-28 00:50:40.800109873 +0100
3 
@@ -37,7 +37,7 @@
4 
 }
5
6 
 cpus() {
7 
-	sysctl -N dev.cpu |
8 
+	/sbin/sysctl -N dev.cpu |
9 
 	awk -F. '$4 == "temperature" { print $3 }'
10 
 }
11
3 
@@ -75,7 +75,7 @@
 12 
@@ -75,7 +75,7 @@
4 
 	reqcpus
 13 
 	reqcpus
5 
 	for cpu in $cpus ; do
 14 
 	for cpu in $cpus ; do
6 
 		echo -n "CPU$cpu.value "
 15 
 		echo -n "CPU$cpu.value "
7 
-		sysctl -n dev.cpu.$cpu.temperature
 16 
-		sysctl -n dev.cpu.$cpu.temperature
8 
+		sysctl -n dev.cpu.$cpu.temperature | tr -d 'C'
 17 
+		/sbin/sysctl -n dev.cpu.$cpu.temperature | tr -d 'C'
9 
 	done
 18 
 	done
10 
 }
 19 
 }
11
20
(-)munin-node/files/patch-node-node.d.freebsd-dev_cpu_.diff (-3 / +12 lines)
Lines 1-11 Link Here
1 
--- ./plugins/node.d.freebsd/dev_cpu_.in.orig	2011-02-15 00:02:38.000000000 +0100
 1 
--- ./plugins/node.d.freebsd/dev_cpu_.in.orig	2009-09-16 12:04:17.000000000 +0200
2 
+++ ./plugins/node.d.freebsd/dev_cpu_.in	2011-02-15 00:03:19.000000000 +0100
 2 
+++ ./plugins/node.d.freebsd/dev_cpu_.in	2011-02-28 00:51:25.582132769 +0100
3 
@@ -39,7 +39,7 @@
4 
 }
5
6 
 cpus() {
7 
-	sysctl -N dev.cpu | awk -F. '$4 == "'"$func"'" { print $3 }'
8 
+	/sbin/sysctl -N dev.cpu | awk -F. '$4 == "'"$func"'" { print $3 }'
9 
 }
10
11 
 reqcpus() {
3 
@@ -109,7 +109,7 @@
 12 
@@ -109,7 +109,7 @@
4 
 	reqcpus
 13 
 	reqcpus
5 
 	for cpu in $cpus ; do
 14 
 	for cpu in $cpus ; do
6 
 		echo -n "CPU$cpu.value "
 15 
 		echo -n "CPU$cpu.value "
7 
-		sysctl -n "dev.cpu.$cpu.$func"
 16 
-		sysctl -n "dev.cpu.$cpu.$func"
8 
+		sysctl -n "dev.cpu.$cpu.$func" | tr -d 'C'
 17 
+		/sbin/sysctl -n "dev.cpu.$cpu.$func" | tr -d 'C'
9 
 	done
 18 
 	done
10 
 }
 19 
 }
11
20
(-)munin-node/files/patch-plugins__node.d__ntp_kernel_err.in (+17 lines)
Line 0 Link Here
1 
--- ./plugins/node.d/ntp_kernel_err.in.orig	2011-02-28 00:35:09.994732672 +0100
2 
+++ ./plugins/node.d/ntp_kernel_err.in	2011-02-28 00:36:06.910859461 +0100
3 
@@ -33,7 +33,7 @@
4
5 
 if [ "$1" = "autoconf" ]; then
6 
     # Not all ntpdc's are equal
7 
-    ntpdc -c kern 2>/dev/null |
8 
+    /usr/sbin/ntpdc -c kern 2>/dev/null |
9 
     awk 'BEGIN { ev=1; }
10 
          /^estimated error:/ { ev=0; }
11 
          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
12 
@@ -51,4 +51,4 @@
13 
 fi
14
15 
 echo -n 'ntp_err.value '
16 
-ntpdc -c kern | awk '/^estimated error:/ { print $3 }'
17 
+/usr/sbin/ntpdc -c kern | awk '/^estimated error:/ { print $3 }'
(-)munin-node/files/patch-plugins__node.d__ntp_kernel_pll_freq.diff (+17 lines)
Line 0 Link Here
1 
--- ./plugins/node.d/ntp_kernel_pll_freq.in.orig	2011-02-28 00:35:10.015020687 +0100
2 
+++ ./plugins/node.d/ntp_kernel_pll_freq.in	2011-02-28 00:36:34.236694522 +0100
3 
@@ -39,7 +39,7 @@
4 
 # $Id: ntp_kernel_pll_freq.in,v 1.1.1.1 2006/06/04 20:53:57 he Exp $
5
6 
 if [ "$1" = "autoconf" ]; then
7 
-    ntpdc -c kern 2>/dev/null |
8 
+    /usr/sbin/ntpdc -c kern 2>/dev/null |
9 
     awk 'BEGIN { ev=1; }
10 
          /^pll frequency:/ { ev=0; }
11 
          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
12 
@@ -64,4 +64,4 @@
13 
 fi
14
15 
 echo -n 'ntp_pll_freq.value '
16 
-ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
17 
+/usr/sbin/ntpdc -c kern | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
(-)munin-node/files/patch-plugins__node.d__ntp_kernel_pll_off.diff (+17 lines)
Line 0 Link Here
1 
--- ./plugins/node.d/ntp_kernel_pll_off.in.orig	2011-02-28 00:35:10.035351721 +0100
2 
+++ ./plugins/node.d/ntp_kernel_pll_off.in	2011-02-28 00:36:46.023122495 +0100
3 
@@ -32,7 +32,7 @@
4 
 # $Id: ntp_kernel_pll_off.in,v 1.1.1.1 2006/06/04 20:53:57 he Exp $
5
6 
 if [ "$1" = "autoconf" ]; then
7 
-    ntpdc -c kern 2>/dev/null |
8 
+    /usr/sbin/ntpdc -c kern 2>/dev/null |
9 
     awk 'BEGIN { ev=1; }
10 
          /^pll offset:/ { ev=0; }
11 
          END { if (ev == 0) { print "yes";} else { print "no"; } exit ev; }'
12 
@@ -50,4 +50,4 @@
13 
 fi
14
15 
 echo -n 'ntp_pll_off.value '
16 
-ntpdc -c kern | awk '/^pll offset:/ { print $3 }'
17 
+/usr/sbin/ntpdc -c kern | awk '/^pll offset:/ { print $3 }'
(-)munin-node/files/patch-plugins__node.d__postfix_mailqueue.diff (+11 lines)
Line 0 Link Here
1 
--- ./plugins/node.d/postfix_mailqueue.in.orig	2011-02-28 00:48:36.935940082 +0100
2 
+++ ./plugins/node.d/postfix_mailqueue.in	2011-02-28 00:49:17.298330137 +0100
3 
@@ -84,7 +84,7 @@
4 
 # atempt to get spooldir via postconf, but environment overrides.
5
6 
 # Remember that postconf is not available unless postfix is.
7 
-POSTCONFSPOOL="$(postconf -h queue_directory 2>/dev/null || echo /var/spool/postfix)"
8 
+POSTCONFSPOOL="$(/usr/local/sbin/postconf -h queue_directory 2>/dev/null || echo /var/spool/postfix)"
9 
 SPOOLDIR=${spooldir:-$POSTCONFSPOOL}
10
11 
 . $MUNIN_LIBDIR/plugins/plugin.sh

Return to bug 155109