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

defect 3055837: make the runcmd subroutine has an argument to decide whether to output the error message when executing a command string

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7302 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2010-08-30 07:57:46 +00:00
parent b6d64ce682
commit c995741769
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT/postscripts/xcataixpost
View File

@ -313,7 +313,7 @@ if (@ARGV<1) {
}
} else {
#called by updatenode, infrom user it is done
print "returned from postscript";
print "returned from postscript\n";
print $::LOG_FILE "$::sdate xcataixpost: returned from postscript.\n";
}
@ -340,7 +340,7 @@ $nodesetstat =~ s/'|"//g;
if ($nodesetstat eq 'standalone') {
# see if it is already there
my $lsicmd = "/usr/sbin/lsitab xcat > /dev/null 2>&1";
if (&runcmd($lsicmd) == 0) {
if (&runcmd($lsicmd, 0) == 0) {
# ok - remove the entry
my $rmitab_cmd = 'rmitab "xcat" > /dev/null 2>&1';
if (&runcmd($rmitab_cmd) != 0) {
@ -478,11 +478,20 @@ sub updateflag {
#####################################################
#
# run the command
# the first argument is the command string
# the second argument is the log flag,
# 0 - does NOT log error message
# 1 - log error message
# if it is not specified, it equals to 1
#
#####################################################
sub runcmd
{
my ($cmd) = @_;
my ($cmd, $logerr) = @_;
if(! defined($logerr)) {
$logerr = 1;
}
my $rc=0;
$cmd .= ' 2>&1' ;
$::outref = [];
@ -490,10 +499,10 @@ sub runcmd
if ($?)
{
$rc = $? >> 8;
if ($rc > 0)
if ($rc > 0 && $logerr)
{
print "$::sdate xcataixpost: $::outref\n";
print $::LOG_FILE "$::sdate xcataixpost: $::outref\n";
print "$::sdate xcataixpost: run: $cmd - $::outref\n";
print $::LOG_FILE "$::sdate xcataixpost: run: $cmd - $::outref\n";
}
}
return $rc;