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

Merge pull request #2228 from immarvin/ondisklessimg

Browse Source 
fix issue [CUSTOMER] Stale rootimg.gz file left in the rootimg dir caused node boot failed. #2225
This commit is contained in:
cxhong 2016-11-29 22:02:13 -05:00 committed by GitHub
commit 7cc39f8fe0
2 changed files with 3 additions and 8 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

@ -481,13 +481,8 @@ sub process_request {
}
$suffix = $method.".".$suffix;
unlink("$destdir/rootimg.sfs");
unlink("$destdir/rootimg.gz");
unlink("$destdir/rootimg.cpio.xz");
unlink("$destdir/rootimg.cpio.gz");
unlink("$destdir/rootimg.tar.xz");
unlink("$destdir/rootimg.tar.gz");
unlink glob("$destdir/rootimg.*");
if ($method =~ /cpio/) {
if (!$exlistloc) {
$excludestr = "find . -xdev -print0 | cpio -H newc -o -0 | $compress -c - > ../rootimg.$suffix";

2
xCAT-server/lib/xcat/plugins/rmimage.pm
View File

@ -197,7 +197,7 @@ sub process_request {
}
my @filestoremove = ("$imagedir/kernel", "$imagedir/initrd-stateless.gz", "$imagedir/initrd-statelite.gz");
my @rootimgtars=glob "$imagedir/rootimg.{tar,cpio}.{xz,gz}";
my @rootimgtars=glob "$imagedir/rootimg.*";
push @filestoremove,@rootimgtars;
#unmount all the mount points under rootimg directory
#to avoid removing the directory/files on management node by mistake