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

Merge pull request #6082 from neo954/rhels8-tmp

Browse Source 
Merge master branch to rhels8 branch
This commit is contained in:
yangsong 2019-03-12 18:25:14 +08:00 committed by GitHub
commit 50c23478d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -2250,7 +2250,7 @@ sub copycd
print $KID $_ . "\n";
}
close($KID);
$rc = $?;
$rc = $? >> 8;
}
else
{
@ -2261,22 +2261,18 @@ sub copycd
my $copied = 0;
my ($percent, $fout);
while (<PIPE>) {
next if /^cpio:/;
if (/^cpio:/) {
chomp;
$callback->({ data => $_ });
next;
}
$percent = $copied / $numFiles;
$fout = sprintf "%0.2f%%", $percent * 100;
$callback->({ sinfo => "$fout" });
++$copied;
}
if ($copied == $numFiles)
{
#media copy success
exit(0);
}
else
{
#media copy failed
exit(1);
}
close(PIPE);
exit($? >> 8);
}
#my $rc = system("cd $path; find . | nice -n 20 cpio -dump $installroot/$distname/$arch");
@ -2297,7 +2293,7 @@ sub copycd
if ($rc != 0)
{
$callback->({ error => "Media copy operation failed, status $rc" });
$callback->({ error => "Media copy operation failed, status $rc", errorcode => [1] });
}
else
{