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

make copycds to abort correctly

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14541 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
immarvin 2012-12-04 13:25:52 +00:00
parent 70257d7acd
commit 6aab6faf02
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -1193,6 +1193,8 @@ sub copycd
}
}
closedir($dirh);
unless ($distname and $discnumber)
{
@ -1268,15 +1270,24 @@ sub copycd
{data => "Copying media to $ospkgpath"});
my $rc;
$SIG{INT} = $SIG{TERM} = sub {
$SIG{INT} = $SIG{TERM} = sub {
foreach(@cpiopid){
kill 2, $_;
}
if ($mntpath) {
kill 15, $_;
use POSIX ":sys_wait_h";
my $kid=0;
do {
$kid = waitpid($_, WNOHANG);
} while $kid != $_;
}
if ($mntpath) {
chdir("/");
system("umount $mntpath");
}
system("rm -rf $mntpath");
}
exit;
};
my $kid;
chdir $mntpath;
my $numFiles = `find . -print | wc -l`;
@ -1288,6 +1299,7 @@ sub copycd
if ($child) {
push @cpiopid,$child;
my @finddata = `find .`;
chdir("/");
for (@finddata) {
print $kid $_;
}
@ -1297,6 +1309,7 @@ sub copycd
my $c = "nice -n 20 cpio -vdump $ospkgpath";
my $k2 = open(PIPE, "$c 2>&1 |") ||
$callback->({error => "Media copy operation fork failure"});
chdir("/");
push @cpiopid, $k2;
my $copied = 0;
my ($percent, $fout);