arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

convert call to xdsh to runxcmd

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14509 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2012-11-30 13:18:13 +00:00
parent 508ef7a226
commit 848372a367
1 changed files with 36 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
xCAT-server/lib/xcat/plugins/updatenode.pm
View File

@@ -1302,73 +1302,58 @@ sub updatenoderunps
# for updatenode -P
$mode = "1";
}
my $args1;
if ($::SETSERVER)
{
$cmd =
"$::XCATROOT/bin/xdsh $nodestring -s -v -e $installdir/postscripts/xcataixpost -M $snkey -c $mode --tftp $tftpdir '$postscripts' 2>&1";
$args1 = [
"--nodestatus",
"-s",
"-v",
"-e",
"$installdir/postscripts/xcataixpost -M $snkey -c $mode --tftp $tftpdir '$postscripts'"
];
}
else
{
$cmd =
"$::XCATROOT/bin/xdsh $nodestring -s -v -e $installdir/postscripts/xcataixpost -m $snkey -c $mode --tftp $tftpdir '$postscripts' 2>&1";
$args1 = [
"--nodestatus",
"-s",
"-v",
"-e",
"$installdir/postscripts/xcataixpost -m $snkey -c $mode --tftp $tftpdir '$postscripts' "
];
}
if ($::VERBOSE)
{
my $rsp = {};
$rsp->{data}->[0] =
" $localhostname: Internal call command: $cmd";
$callback->($rsp);
my $rsp = {};
$rsp->{data}->[0] =
" $localhostname: Internal call command: xdsh $nodestring "
. join(' ', @$args1);
$callback->($rsp);
}
if (!open(CMD, "$cmd |"))
$CALLBACK = $callback;
if ($request->{rerunps4security})
{
my $rsp = {};
$rsp->{data}->[0] = "$localhostname: Cannot run command $cmd";
$callback->($rsp);
$RERUNPS4SECURITY = $request->{rerunps4security}->[0];
}
else
{
my $rsp = {};
my $output;
while (<CMD>)
{
$output = $_;
chomp($output);
$output =~ s/\\cM//;
if ($output =~ /returned from postscript/)
{
$output =~
s/returned from postscript/Running of postscripts has completed./;
}
if ( $request->{rerunps4security}
&& $request->{rerunps4security}->[0] eq "yes")
{
if ($output =~ /Running of postscripts has completed/)
{
$output =~
s/Running of postscripts has completed/Redeliver security files has completed/;
push @{$rsp->{data}}, $output;
}
elsif ($output !~
/Running postscript|Error loading module/)
{
push @{$rsp->{data}}, $output;
}
}
elsif ($output !~ /Error loading module/)
{
push @{$rsp->{data}}, "$output";
}
}
close(CMD);
# # build the list of good and bad nodes
# &buildnodestatus(\@$output,$callback);
# return information
$callback->($rsp);
$RERUNPS4SECURITY = "";
}
$subreq->(
{
command => ["xdsh"],
node => $servernodes{$snkey},
arg => $args1,
_xcatpreprocessed => [1]
},
\&getdata
);
}
}
if ( $request->{rerunps4security}
&& $request->{rerunps4security}->[0] eq "yes")