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

defect 3819 enhance -s behavior

Browse Source
This commit is contained in:
lissav 2013-10-15 08:15:12 -04:00
parent 3aca3b2a70
commit 248415daea
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,17 +294,18 @@ sub preprocess_updatenode
return;
}
# -s must work with -P or -S or --security
if ($::SETSERVER && !($::SWMAINTENANCE || $::RERUNPS || $::SECURITY))
# -s must not be with any other flag, this updates xcatinfo and run setuppostbootscripts
if ($::SETSERVER && ($::SWMAINTENANCE || $::RERUNPS || $::SECURITY))
{
my $rsp = {};
$rsp->{data}->[0] =
"If you specify the -s flag you must specify either the -S or -k or -P
"If you specify the -s flag you must not specify either the -S or -k or -P
flags";
$callback->($rsp);
return;
} else {
$::RERUNPS = "setuppostbootscripts";
}
# -f or -F not both
if (($::FILESYNC) && ($::SNFILESYNC))
{
@ -1306,7 +1307,7 @@ sub updatenoderunps
# should be kept the same.
my $runpscmd;
if ($::SETSERVER){
if ($::SETSERVER){ # update the xcatinfo file on the node and run setuppostbootscripts
$runpscmd =
"$installdir/postscripts/xcatdsklspost $mode -M $snkey '$postscripts' --tftp $tftpdir --installdir $installdir --nfsv4 $nfsv4 -c";
} else {
@ -1723,19 +1724,8 @@ sub updatenodesoftware
my $nodestring = join(',', @{$servernodes{$snkey}});
my $cmd;
my $args1;
if ($::SETSERVER)
{
$cmd =
"$installdir/postscripts/xcatdsklspost 2 -M $snkey 'ospkgs,otherpkgs' --tftp $tftpdir --installdir $installdir --nfsv4 $nfsv4 -c" ;
}
else
{
$cmd =
$cmd =
"$installdir/postscripts/xcatdsklspost 2 -m $snkey 'ospkgs,otherpkgs' --tftp $tftpdir --installdir $installdir --nfsv4 $nfsv4 -c";
}
# add flowcontrol flag
if ($flowcontrol == 1){
$cmd .= " -F";