Author: baggins                      Date: Mon Nov 13 14:06:19 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- full path to ntpq for ntp_

---- Files affected:
SOURCES:
   munin-plugins.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/munin-plugins.patch
diff -u SOURCES/munin-plugins.patch:1.11 SOURCES/munin-plugins.patch:1.12
--- SOURCES/munin-plugins.patch:1.11    Mon Nov 13 12:33:29 2006
+++ SOURCES/munin-plugins.patch Mon Nov 13 15:06:14 2006
@@ -628,3 +628,51 @@
        while ($data =~ /([a-z.]+): (.+)\b/g) {
                my $label = $1;
                my $value = $2;
+--- munin-1.3.3/node/node.d/ntp_.in~   2006-11-10 13:39:13.000000000 +0100
++++ munin-1.3.3/node/node.d/ntp_.in    2006-11-13 15:05:27.000000000 +0100
+@@ -25,9 +25,9 @@
+ use Socket;
+ 
+ if ($ARGV[0] and $ARGV[0] eq "autoconf") {
+-      `ntpq -c help >/dev/null 2>/dev/null`;
++      `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+       if ($? eq "0") {
+-              if (`ntpq -c "hostnames no" -c peers | wc -l` > 0) {
++              if (`/usr/sbin/ntpq -c "hostnames no" -c peers | wc -l` > 0) {
+                       print "yes\n";
+                       exit 0;
+               } else {
+@@ -35,13 +35,13 @@
+                       exit 1;
+               }
+       } else {
+-              print "no (ntpq not found)\n";
++              print "no (/usr/sbin/ntpq not found)\n";
+               exit 1;
+       }
+ }
+ 
+ if ($ARGV[0] and $ARGV[0] eq "suggest") {
+-      my @lines = `ntpq -c "hostnames no" -c peers`;
++      my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
+       foreach (@lines) {
+               next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+               next if /^.224\.0\.1\.1/;
+@@ -61,7 +61,7 @@
+ exit 2 unless defined $name;
+ 
+ if ($ARGV[0] and $ARGV[0] eq "config") {
+-      my @lines = `ntpq -c "hostnames no" -c peers`;
++      my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
+       my $host;
+       foreach (@lines) {
+               next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+@@ -89,7 +89,7 @@
+         exit 0;
+ }
+ 
+-my @lines = `ntpq -c "hostnames no" -c peers`;
++my @lines = `/usr/sbin/ntpq -c "hostnames no" -c peers`;
+ foreach (@lines) {
+       next unless /^.(\d+\.\d+\.\d+\.\d+)/;
+       next if /^.224\.0\.1\.1/;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/munin-plugins.patch?r1=1.11&r2=1.12&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to