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

-Have copycds umount on interrupt, SF bug 1962643

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1409 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-05-15 15:48:34 +00:00
parent 8a51df6b90
commit 59ab923725
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -771,6 +771,9 @@ sub copycd
my $reaped = 0;
$SIG{INT} = $SIG{TERM} = sub {
if ($cpiopid) { kill 2, $cpiopid; exit 0; }
if ($::CDMOUNTPATH) {
system("umount $::CDMOUNTPATH");
}
};
my $KID;
chdir $path;

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

@ -32,6 +32,7 @@ sub process_request {
my $distname = undef;
my $arch = undef;
$identified=0;
$::CDMOUNTPATH="/mnt/xcat";
@ARGV = @{$request->{arg}};
GetOptions(
@ -69,6 +70,7 @@ sub process_request {
push @{$newreq->{arg}},("-a",$arch);
}
$doreq->($newreq,\&take_answer);
$::CDMOUNTPATH="";
system("umount /mnt/xcat");
unless ($identified) {

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

@ -412,7 +412,11 @@ sub copycd
mkpath("$installroot/$distname/$arch/$discnumber");
umask $omask;
my $rc;
$SIG{INT} = $SIG{TERM} = sub { if ($cpiopid) { kill 2, $cpiopid; exit 0; } };
$SIG{INT} = $SIG{TERM} = sub { if ($cpiopid) { kill 2, $cpiopid; exit 0; }
if ($::CDMOUNTPATH) {
system("umount $::CDMOUNTPATH");
}
};
my $kid;
chdir $path;
my $child = open($kid,"|-");