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

big fix

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5778 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2010-04-15 13:06:52 +00:00
parent 500d775412
commit a554209347
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT-server/lib/xcat/plugins/packimage.pm
View File

@ -158,16 +158,17 @@ sub process_request {
$excludetext .= $_;
}
close($exlist);
#handle the #INLCUDE# tag recursively
my $idir = dirname($exlistloc);
my $doneincludes=0;
while (not $doneincludes) {
$doneincludes=1;
if ($excludetext =~ /#INCLUDE:[^#]+#/) {
if ($excludetext =~ /#INCLUDE:[^#^\n]+#/) {
$doneincludes=0;
$excludetext =~ s/#INCLUDE:([^#]+)#/include_file($1,$idir)/eg;
$excludetext =~ s/#INCLUDE:([^#^\n]+)#/include_file($1,$idir)/eg;
}
}
my @tmp=split("\n", $excludetext);
@ -189,7 +190,7 @@ sub process_request {
$includestr =~ s/-o $//;
$includestr = "find . " . $includestr;
}
#print "\nexcludestr=$excludestr\n\n includestr=$includestr\n\n";
# print "\nexcludestr=$excludestr\n\n includestr=$includestr\n\n";
# add the xCAT post scripts to the image
if (! -d "$rootimg_dir") {