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

chomped newlines from runcmd streaming output and updated site.runbootscripts description

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14111 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
bp-sawyers 2012-10-24 15:37:47 +00:00
parent 510bd44fd2
commit dd11950993
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
perl-xCAT/xCAT/Client.pm
View File

@ -906,8 +906,8 @@ sub populate_site_hash {
##########################################
# handle_response is a default callback that can be passed into submit_response()
# It is invoked repeatedly by submit_response() to print out the data returned by
# handle_response is a default callback that can be passed into submit_request()
# It is invoked repeatedly by submit_request() to print out the data returned by
# the plugin.
#
# The normal flow is:

6
perl-xCAT/xCAT/Schema.pm
View File

@ -919,8 +919,10 @@ site => {
" the node deployment, node discovery and power operations. The default is to update.\n\n".
" ntpservers: A comma delimited list of NTP servers for the cluster - often the\n".
" xCAT management node.\n\n".
" runbootscripts: If set to 'yes' the scripts listed in the osimage and postscripts tables\n".
" postbootscripts attribute will be run at each reboot of the node.\n\n".
" runbootscripts: If set to 'yes' the scripts listed in the postbootscripts\n".
" attribute in the osimage and postscripts tables will be run during\n".
" each reboot of stateful (diskful) nodes. This attribute has no\n".
" effect on stateless and statelite nodes.\n\n".
" syspowerinterval: For system p CECs, this is the number of seconds the rpower\n".
" command will wait between performing the action for each CEC.\n".
" For system x IPMI servers, this is the number of seconds the\n".

6
perl-xCAT/xCAT/Utils.pm
View File

@ -964,16 +964,18 @@ sub runcmd
my $errout;
open (PIPE, "$cmd |");
while (<PIPE>) {
push @$outref, $_;
chomp; # get rid of the newline, because the client will add one
if ($::CALLBACK){
$rsp->{data}->[0] = $_;
$::CALLBACK->($rsp);
} else {
xCAT::MsgUtils->message("D", "$_");
}
$output .= $_;
#$output .= $_;
}
# store the return string
push @$outref,$output;
#push @$outref,$output;
}
# now if not streaming process errors

6
xCAT-client/bin/genimage
View File

@ -212,7 +212,7 @@ if ((!$imagename) && (!$os)){
chomp($os);
}
print " OS: $os\n";
if ($os) { print " OS: $os\n"; }
@ -282,7 +282,7 @@ if ((!$imagename) && (!$profile)){
}
}
}
print " Profile: $profile\n";
if ($profile) { print " Profile: $profile\n"; }
# get the interface
if ((!$imagename) && (!$interface)){
@ -311,7 +311,7 @@ if ((!$imagename) && (!$interface)){
}
}
}
print " Interface: $interface\n";
if ($interface) { print " Interface: $interface\n"; }