From: Russ Allbery <rra@stanford.edu>
Date: Thu, 21 Oct 2010 16:22:39 +0000 (-0700)
Subject: Also look for /usr/sbin/rxdebug and /usr/local/sbin/rxdebug
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2c663afd4bf8684a7aed3055b28dd22f621f4a04;p=packages%2Fa%2Fafs-monitor.git

Also look for /usr/sbin/rxdebug and /usr/local/sbin/rxdebug

Upstream Makefiles install into sbin by default.
---

diff --git a/NEWS b/NEWS
index b2e9d7b..6ea5d4d 100644
--- a/NEWS
+++ b/NEWS
@@ -29,3 +29,6 @@ afs-monitor 2.0 (unreleased)
 
     If check_bos is successful, report the number of instances running
     normally.  Patch from Steve Rader.
+
+    Look for rxdebug in /usr/sbin and /usr/local/sbin since OpenAFS
+    installs it into sbindir by default.
diff --git a/check_rxdebug b/check_rxdebug
index 4e497fd..86d388e 100755
--- a/check_rxdebug
+++ b/check_rxdebug
@@ -41,7 +41,9 @@ our $TIMEOUT = 60;
 
 # The full path to rxdebug.  Make sure that this is on local disk so that
 # monitoring doesn't have an AFS dependency.
-our ($RXDEBUG) = grep { -x $_ } qw(/usr/bin/rxdebug /usr/local/bin/rxdebug);
+our ($RXDEBUG) = grep { -x $_ }
+    qw(/usr/bin/rxdebug /usr/sbin/rxdebug /usr/local/bin/rxdebug
+       /usr/local/sbin/rxdebug);
 $RXDEBUG ||= '/usr/bin/rxdebug';
 
 ##############################################################################