xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 1/4] PDU: ipmi: Use arrays rather than strings for cmd
Date: Wed, 11 Jul 2018 15:54:04 +0100	[thread overview]
Message-ID: <1531320847-10243-1-git-send-email-ian.jackson@eu.citrix.com> (raw)

This allows arguments with spaces, etc.

No functional change with the existing configurations I know about.
It would be good to fix this before any configurations are created
where this would make a difference...

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 Osstest/PDU/ipmi.pm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Osstest/PDU/ipmi.pm b/Osstest/PDU/ipmi.pm
index dbf211f..f3a50c9 100644
--- a/Osstest/PDU/ipmi.pm
+++ b/Osstest/PDU/ipmi.pm
@@ -49,11 +49,17 @@ sub pdu_power_state {
     my ($mo, $on) = @_;
     my $onoff= $on ? "on" : "off";
 
-    my $cmd = "ipmitool -H $mo->{Mgmt} -U $mo->{User} -P $mo->{Pass}";
+    my @cmd = (qw(ipmitool -H), $mo->{Mgmt},
+               '-U',$mo->{User}, '-P',$mo->{Pass});
 
     my $getstatus = sub {
-        my $status = `$cmd power status`
-            or die "Cannot retrieve current power status";
+        my @scmd = (@cmd, qw(power status));
+        logm("PDU IMPI: @scmd");
+        open IPMI, "-|", @scmd or die $!;
+        my $status = do { local $/=undef; <IPMI>; };
+        $?=0; $!=0;
+        close IPMI and $status or
+            die "Cannot retrieve current power status ($? $!)";
         chomp($status);
         logm("$status (want $onoff)");
         $status =~ s/^Chassis Power is (on|off)$/$1/
@@ -66,7 +72,7 @@ sub pdu_power_state {
 	return;
     }
 
-    system_checked("$cmd power $onoff");
+    system_checked((@cmd, qw(power), $onoff));
 
     my $count = 60;
     for (;;) {
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

             reply	other threads:[~2018-07-11 14:54 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-11 14:54 Ian Jackson [this message]
2018-07-11 14:54 ` [OSSTEST PATCH 2/4] PDU: pause: Honour OSSTEST_PDU_NOPAUSE Ian Jackson
2018-07-11 14:54 ` [OSSTEST PATCH 3/4] PDU: ipmi: Only log the first cmd run Ian Jackson
2018-07-11 14:54 ` [OSSTEST PATCH 4/4] PDU: ipmi: Pass further options to ipmitool Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1531320847-10243-1-git-send-email-ian.jackson@eu.citrix.com \
    --to=ian.jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).