xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

update code of packimage (#1685)

Browse Source
This commit is contained in:
penguhyang 2016-08-12 14:46:52 +08:00 committed by yangsong
parent 28144017e4
commit d44176f1d1
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/lib/xcat/plugins/packimage.pm
View File

@ -220,7 +220,7 @@ sub process_request {
}
}
#before generating rootimg.gz, copy $installroot/postscripts into the image at /xcatpost
#before generating rootimg.$suffix, copy $installroot/postscripts into the image at /xcatpost
if (-e "$rootimg_dir/xcatpost") {
system("rm -rf $rootimg_dir/xcatpost");
}
@ -240,7 +240,7 @@ sub process_request {
`echo TIMESTAMP="'$timestamp'" >> $rootimg_dir/opt/xcat/xcatinfo`;
# before generating rootimg.gz or rootimg.sfs, need to switch the rootimg to stateless mode if necessary
# before generating rootimg.$suffix or rootimg.sfs, need to switch the rootimg to stateless mode if necessary
my $rootimg_status = 0; # 0 means stateless mode, while 1 means statelite mode
$rootimg_status = 1 if (-f "$rootimg_dir/.statelite/litefile.save");
@ -418,8 +418,6 @@ sub process_request {
return 1;
}
$callback->({ data => ["Packing contents of $rootimg_dir"] });
unlink("$destdir/rootimg.gz");
unlink("$destdir/rootimg.sfs");
my $suffix;
if ($compress) {
@ -470,6 +468,8 @@ sub process_request {
}
$suffix = $method.".".$suffix;
unlink("$destdir/rootimg.$suffix");
unlink("$destdir/rootimg.sfs");
if ($method =~ /cpio/) {
if (!$exlistloc) {
$excludestr = "find . -xdev -print0 | cpio -H newc -o -0 | $compress -c - > ../rootimg.$suffix";