xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-11 15:50:11 +00:00
Code Issues Releases Wiki Activity

use the same way to promote error msg (#1749)

Browse Source
This commit is contained in:
penguhyang
2016-08-22 13:39:09 +08:00
committed by yangsong
parent cbf665f2d1
commit c4a536a18f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -417,7 +417,6 @@ sub process_request {
$callback->({ error => ["$rootimg_dir does not exist, run genimage -o $osver -p $profile on a server with matching architecture"] });
return 1;
}
$callback->({ data => ["Packing contents of $rootimg_dir"] });
my $suffix;
if ($compress) {
@ -462,6 +461,11 @@ sub process_request {
$suffix = "gz";
}
unless (($method eq 'cpio') or ($method eq 'tar') or ($method eq 'squashfs')) {
$callback->({ error => ["Invalid archive method '$method' requested"], errorcode => [1] });
return 1;
}
$callback->({ data => ["Packing contents of $rootimg_dir"] });
$callback->({ info => ["archive method:$method"] });
unless ($method =~ /squashfs/) {
$callback->({ info => ["compress method:$compress"] });
@ -517,9 +521,6 @@ sub process_request {
system("$includestr >> $xcat_packimg_tmpfile");
}
$excludestr = "cat $xcat_packimg_tmpfile|cpio -dump $temppath";
} else {
$callback->({ error => ["Invalid archive method '$method' requested"], errorcode => [1] });
return 1;
}
chdir("$rootimg_dir");