From c5265793c5256326d2d34b7fa313314d81bdd3f5 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Mon, 10 Jul 2017 14:06:25 -0400 Subject: [PATCH] Print info message and allow rspconfig sshcfg to go through --- xCAT-server/lib/xcat/plugins/openbmc.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index eae17d85f..d9a57923f 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -472,7 +472,7 @@ sub parse_args { # # disable function until fully tested # - $check = unsupported($callback); if (ref($check) eq "ARRAY") { return $check; } + $check = unsupported($callback); # Check later for each subcommand: if (ref($check) eq "ARRAY") { return $check; } my $setorget; foreach $subcommand (@ARGV) { if ($subcommand =~ /^(\w+)=(.*)/) { @@ -488,9 +488,11 @@ sub parse_args { return ([ 1, "Can not configure more than 1 nodes' ip at the same time" ]) if ($nodes_num >= 2); } $setorget = "set"; + if (ref($check) eq "ARRAY") { return $check; } } elsif ($subcommand =~ /^ip$|^netmask$|^gateway$|^vlan$/) { return ([ 1, "Can not configure and display nodes' value at the same time" ]) if ($setorget and $setorget eq "set"); $setorget = "get"; + if (ref($check) eq "ARRAY") { return $check; } } elsif ($subcommand =~ /^sshcfg$/) { $setorget = ""; # SSH Keys are copied using a RShellAPI, not REST API } else { @@ -547,6 +549,8 @@ sub parse_command_status { my $command = shift; my $subcommand; + xCAT::SvrUtils::sendmsg("Ensure you are running 1724B or higher.", $callback); + $next_status{LOGIN_REQUEST} = "LOGIN_RESPONSE"; my $verbose = undef;