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

change check to handle regx in postscripts list

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11325 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-01-03 19:45:17 +00:00
parent d221b16eaa
commit 9d68902931
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/sbin/xcatconfig
View File

@ -1809,11 +1809,11 @@ sub cleanupPSTable
my $pslist=$entry->{'postscripts'};
if ($pslist) {
my $servicenode=0;
my $newpslist ="\"";
my $newpslist ="\'";
my @ps= split(",", $pslist);
# now check is servicenode and xcatclient and/or xcatserver in the list
foreach my $pscript (@ps) {
if ($pscript =~ /^servicenode/i) { # found servicenode ps
if ($pscript =~ /(^|\|)servicenode($|\|)/i) { # found servicenode ps
$newpslist .=$pscript;
$newpslist .=",";
$servicenode=1;
@ -1822,7 +1822,7 @@ sub cleanupPSTable
$newpslist .=$pscript;
$newpslist .=",";
} else { # servicenode found, do not keep xcatserver/xcatclient
if (($pscript =~ /^xcatserver/i) ||($pscript =~ /^xcatclient/i)) {
if (($pscript =~ /(^|\|)xcatserver($|\|)/i) ||($pscript =~ /(^|\|)xcatclient($|\|)/i)) {
next;
} else {
$newpslist .=$pscript;
@ -1832,7 +1832,7 @@ sub cleanupPSTable
}
}
chop $newpslist;
$newpslist .="\"";
$newpslist .="\'";
my $chtabcmds .=
"$::XCATROOT/sbin/chtab node=$node postscripts.postscripts=$newpslist;";
my $outref = xCAT::Utils->runcmd("$chtabcmds", 0);