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

fixing the migration problem that rmkitcomp should remove the kitdeployment parameter file and its contents.

Browse Source
This commit is contained in:
wanghuaz
2014-01-06 15:19:24 +08:00
parent adb04f1651
commit bb4fa36b29
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
xCAT-server/lib/xcat/plugins/kit.pm
View File

@@ -3004,6 +3004,21 @@ sub rmkitcomp
unless ( $match ) {
my @contents = ();;
if ( -e "$kitdir/other_files/$kitdeployfile" ) {
if (open(KITDEPLOY, "<", "$kitdir/other_files/$kitdeployfile") ) {
@contents = <KITDEPLOY>;
close(KITDEPLOY);
if($::VERBOSE){
my %rsp;
push@{ $rsp{data} }, "Reading kit deployparams from $kitdir/other_files/$kitdeployfile";
xCAT::MsgUtils->message( "I", \%rsp, $callback );
}
} else {
my %rsp;
push@{ $rsp{data} }, "Could not open kit deployparams file $kitdir/other_files/$kitdeployfile";
xCAT::MsgUtils->message( "E", \%rsp, $callback );
return 1;
}
push @contents, "#INCLUDE:$kitdir/other_files/$kitdeployfile#";
}
@@ -3040,6 +3055,16 @@ sub rmkitcomp
my @otherdeployparams;
my $deployparam_file = $kittable->{kitdir}."/other_files/".$kittable->{kitdeployparams};
if ( -e "$deployparam_file" ) {
if (open(OTHERDEPLOYPARAM, "<", "$deployparam_file" )) {
@otherdeployparams = <OTHERDEPLOYPARAM>;
close(OTHERDEPLOYPARAM);
}
foreach ( @otherdeployparams ) {
push @otherlines, $_;
}
push @otherlines, "#INCLUDE:$deployparam_file#";
}
}