===================================================================
RCS file: /cvs/nagios/check_bioctl/check_bioctl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nagios/check_bioctl/check_bioctl	2009/11/09 20:22:43	1.9
+++ nagios/check_bioctl/check_bioctl	2009/11/12 18:54:38	1.10
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: check_bioctl,v 1.8 2009/11/09 18:11:33 andrew Exp $
+# $RedRiver: check_bioctl,v 1.9 2009/11/09 20:22:43 andrew Exp $
 ########################################################################
 # check_bioctl *** A nagios check for OpenBSD bioctl
 #
@@ -27,16 +27,28 @@
 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 EOL
 
+my $PROGNAME = "check_bioctl";
+my $BIOCTL   = '/sbin/bioctl';
+
 use POSIX;
-use lib "/usr/local/libexec/nagios";
+my $PREFIX;
+BEGIN {
+    ## no critic 'warnings'
+    no warnings 'uninitialized';
+    $PREFIX = "${PREFIX}" || '/usr/local'; # Magic for OpenBSD ports tree
+}
+use lib $PREFIX . '/libexec/nagios';
 use utils qw($TIMEOUT %ERRORS &support);
 
+$SIG{'ALRM'} = sub {
+	print ("ERROR: $PROGNAME timeout\n");
+	exit $ERRORS{'UNKNOWN'};
+};
+alarm($TIMEOUT);
+
 use Getopt::Long;
 Getopt::Long::Configure('bundling');
 
-my $PROGNAME = "check_bioctl";
-my $BIOCTL   = '/sbin/bioctl';
-
 # This maps the status we get from bioctl to something nagios can use
 my %Status_Map = (
     Online      => 'OK',
@@ -70,7 +82,7 @@
 }
 
 if ($opt_V) {
-    print_revision( $PROGNAME, '$Revision: 1.9 $ ' );
+    print_revision( $PROGNAME, '$Revision: 1.10 $ ' );
     exit $ERRORS{'OK'};
 }
 
@@ -190,7 +202,7 @@
 
 EOL
 
-    print_revision( $PROGNAME, '$Revision: 1.9 $' );
+    print_revision( $PROGNAME, '$Revision: 1.10 $' );
 
     print $License;
 }