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

-bug 2740264 is fixed; add code to check whether the exclusion file exists, use if it is not there, ignore it if it is not there.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3175 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2009-04-13 14:39:55 +00:00
parent 0c9cc10542
commit 58b5084841
1 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,22 +64,26 @@ sub process_request {
my $exlistloc=get_exlist_file_name("$installroot/custom/netboot/$distname", $profile, $osver, $arch);
if (!$exlistloc) { $exlistloc=get_exlist_file_name("$::XCATROOT/share/xcat/netboot/$distname", $profile, $osver, $arch); }
if (!$exlistloc)
{
$callback->({error=>["Unable to find file exclusion list under $installroot/custom/netboot/$distname or $::XCATROOT/share/xcat/netboot/$distname/ for $profile/$arch/$osver"],errorcode=>[1]});
next;
}
#if (!$exlistloc)
#{
# $callback->({error=>["Unable to find file exclusion list under $installroot/custom/netboot/$distname or $::XCATROOT/share/xcat/netboot/$distname/ for $profile/$arch/$osver"],errorcode=>[1]});
# next;
#}
#print "exlistloc=$exlistloc\n";
my $exlist;
open($exlist,"<",$exlistloc);
my $excludestr = "find . ";
while (<$exlist>) {
chomp $_;
s/\s*#.*//; #-- remove comments
next if /^\s*$/; #-- skip empty lines
$excludestr .= "'!' -path '".$_."' -a ";
if ($exlistloc) {
my $exlist;
open($exlist,"<",$exlistloc);
#my $excludestr = "find . ";
while (<$exlist>) {
chomp $_;
s/\s*#.*//; #-- remove comments
next if /^\s*$/; #-- skip empty lines
$excludestr .= "'!' -path '".$_."' -a ";
}
close($exlist);
}
close($exlist);
# add the xCAT post scripts to the image
if (! -d "$installroot/netboot/$osver/$arch/$profile/rootimg") {
@ -129,8 +133,12 @@ sub process_request {
unlink("$installroot/netboot/$osver/$arch/$profile/rootimg.sfs");
unlink("$installroot/netboot/$osver/$arch/$profile/rootimg.nfs");
if ($method =~ /cpio/) {
$excludestr =~ s!-a \z!|cpio -H newc -o | gzip -c - > ../rootimg.gz!;
$oldmask = umask 0077;
if (!$exlistloc) {
$excludestr = "find . |cpio -H newc -o | gzip -c - > ../rootimg.gz";
}else {
$excludestr =~ s!-a \z!|cpio -H newc -o | gzip -c - > ../rootimg.gz!;
}
$oldmask = umask 0077;
} elsif ($method =~ /squashfs/) {
$temppath = mkdtemp("/tmp/packimage.$$.XXXXXXXX");
chmod 0755,$temppath;