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

prevent the running of postbootscripts

Browse Source
This commit is contained in:
wanghuaz
2013-12-12 17:35:09 +08:00
parent 7a8b802a86
commit 7c45a82a53
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,7 +482,7 @@ sub assign_to_osimage
}
# Adding postbootscrits to osimage.postbootscripts
if ( $kitcomptable and $kitcomptable->{postbootscripts} ){
if ( !$::noscripts and $kitcomptable and $kitcomptable->{postbootscripts} ){
my @kitcompscripts = split ',', $kitcomptable->{postbootscripts};
foreach my $kitcompscript ( @kitcompscripts ) {
@@ -1823,7 +1823,7 @@ sub addkitcomp
push@{ $rsp{data} }, "Usage: addkitcomp - Add a Kit component to an xCAT osimage.";
push@{ $rsp{data} }, "\taddkitcomp [-h|--help]";
push@{ $rsp{data} }, "\taddkitcomp [-v|--version]";
push@{ $rsp{data} }, "\taddkitcomp [-V|--verbose] [-a|--adddeps] [-f|--force] \n\t\t[-n|--noupgrade] -i <osimage> <kitcompname_list>";
push@{ $rsp{data} }, "\taddkitcomp [-V|--verbose] [-a|--adddeps] [-f|--force] \n\t\t[-n|--noupgrade] [--noscripts] -i <osimage> <kitcompname_list>";
xCAT::MsgUtils->message( "I", \%rsp, $callback, $ret );
};
@@ -1848,6 +1848,7 @@ sub addkitcomp
'a|adddeps' => \$adddeps,
'f|force' => \$force,
'n|noupgrade' => \$::noupgrade,
'noscripts' => \$::noscripts,
'i=s' => \$osimage
);
@@ -2382,6 +2383,7 @@ sub rmkitcomp
'v|version' => \$vers,
'u|uninstall' => \$uninstall,
'f|force' => \$force,
'noscripts' => \$noscripts,
'i=s' => \$osimage
);
@@ -2591,7 +2593,7 @@ sub rmkitcomp
last if ($match);
}
if (!$match) {
if (!$match or $noscripts) {
push @newosimagescripts, $osimagescript;
}