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

Handling postbootscripts in osimage and kitcomponent tables

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14092 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2012-10-23 04:07:56 +00:00
parent aec176a65c
commit 0a87db910b
1 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,21 +292,45 @@ sub assign_to_osimage
# Adding postbootscrits to osimage.postbootscripts
if ( $kitcomptable and $kitcomptable->{postbootscripts} ){
if ( $osimagetable ){
if ( $osimagetable->{postbootscripts} ) {
my $match = 0;
my @scripts = split ',', $osimagetable->{postbootscripts};
foreach my $script ( @scripts ) {
if ( $kitcomptable->{postbootscripts} =~ /^$script$/ ) {
$match = 1;
last;
my @kitcompscripts = split ',', $kitcomptable->{postbootscripts};
foreach my $kitcompscript ( @kitcompscripts ) {
my $formatedkitcomp = "KIT_".$kitcompscript;
if ( $osimagetable ) {
if ( $osimagetable->{postbootscripts} ){
my $match = 0;
my $added = 0;
my @newscripts;
my @scripts = split ',', $osimagetable->{postbootscripts};
foreach my $script ( @scripts ) {
if ( $script =~ /^$formatedkitcomp$/ ) {
$match = 1;
last;
}
if ( $script !~ /^BASEXCAT_/ and $script !~ /^KIT_/ ) {
unless ( $added ) {
push @newscripts, $formatedkitcomp;
$added = 1;
}
}
push @newscripts, $script;
}
if ( $match ) {
next;
}
my $osimagescripts = join ',', @newscripts;
$osimagetable->{postbootscripts} = $osimagescripts;
} else {
$osimagetable->{postbootscripts} = $formatedkitcomp;
}
unless ( $match ) {
$osimagetable->{postbootscripts} = $osimagetable->{postbootscripts} . ',' . $kitcomptable->{postbootscripts};
}
} else {
$osimagetable->{postbootscripts} = $kitcomptable->{postbootscripts};
}
}
@ -1383,7 +1407,9 @@ sub addkitcomp
@oskitcomps = split ',', $osimagetable->{'kitcomponents'};
}
foreach my $kitcomp ( keys %kitcomps ) {
my @newkitcomps = keys %kitcomps;
foreach ( keys %kitcomps ) {
my $kitcomp = shift @newkitcomps;
$callback->({data=>["Assigning kit component $kitcomp to osimage $osimage"]});
# Check if this component is existing in osimage.kitcomponents
@ -1631,7 +1657,7 @@ sub rmkitcomp
foreach my $kitcomponent (keys %kitcomps) {
my @kitcompscripts = split( ',', $kitcomps{$kitcomponent}{postbootscripts} );
foreach my $kitcompscript ( @kitcompscripts ) {
if ( $osimagescript eq $kitcompscript ) {
if ( $osimagescript =~ /^KIT_$kitcompscript$/ ) {
$match = 1;
last;
}