X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-raid-3ware;h=da298e58c3ed18ed1f405bcea1ac121cca2a9b50;hb=44f5f0f4b2c493e83fa73f19bd127bee800f013f;hp=ccecf30edce5b17d3179196c29cb41fd1ebe89ad;hpb=e911075cfec333dd05005176efcd4c7851aa9383;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-raid-3ware b/dsa-nagios-checks/checks/dsa-check-raid-3ware
index ccecf30..da298e5 100755
--- a/dsa-nagios-checks/checks/dsa-check-raid-3ware
+++ b/dsa-nagios-checks/checks/dsa-check-raid-3ware
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 
-# Copyright (C) 2006,2008,2009 Peter Palfrader <peter@palfrader.org>
+# Copyright (C) 2006,2008,2009,2016 Peter Palfrader <peter@palfrader.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -71,7 +71,7 @@ if ($params->{'help'}) {
 if ($params->{'version'}) {
 	print "nagios-check-raid-3ware $VERSION\n";
 	print "nagios check for 3ware raids\n";
-	print "Copyright (c) 2006 Peter Palfrader <peter\@palfrader.org>\n";
+	print "Copyright (c) 2006,2008,2009,2016 Peter Palfrader <peter\@palfrader.org>\n";
 	exit (0);
 };
 
@@ -85,10 +85,20 @@ unless (-e $TW_CLI) {
 	exit $UNKNOWN;
 };
 
-my $sudo = $params->{'no-sudo'} ? '' : 'sudo ';
-my $command = "$sudo $TW_CLI info c$params->{'controller'} u$params->{'unit'} status";
+for my $thing (qw{controller unit}) {
+	if ($params->{$thing} =~ m/^([0-9]+)$/) {
+		$params->{$thing} = $1;
+	} else {
+		die("Invalid $thing $1.\n");
+	}
+};
+
+my @command;
+push @command, "sudo" if $params->{'no-sudo'};
+push @command, ($TW_CLI, 'info', "c$params->{'controller'}", "u$params->{'unit'}", "status");
+my $command = join(' ', @command);
 print STDERR "Running $command\n" if $params->{'verbose'};
-open (TW, "$command|") or die ("Cannot run $command: $!\n");
+open (TW, "-|", @command) or die ("Cannot run $command: $!\n");
 my @tw=<TW>;
 close TW;
 if ($CHILD_ERROR) { # program failed