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

-In ESXi, support splicing in addkcmdline in intelligent places

Browse Source 
-Provide a method for plugins to declare custom processing of addkcmdline rather than the default append to the end


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4009 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2009-08-18 18:59:20 +00:00
parent e9075f1c1d
commit 0ad809aff0
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/esx.pm
View File

@ -2064,16 +2064,25 @@ e.g: nodech $node nodetype.arch=x86\n"]);
# now make <HEX> file entry stuff
my $tp = "xcat/netboot/$osver/$arch";
my $kernel = "$tp/mboot.c32";
my $append = "$tp/vmkboot.gz";
$append .= " --- $tp/vmk.gz";
my $prepend = "$tp/vmkboot.gz";
my $append = " --- $tp/vmk.gz";
$append .= " --- $tp/sys.vgz";
$append .= " --- $tp/cim.vgz";
$append .= " --- $tp/oem.tgz";
$append .= " --- $tp/license.tgz";
$append .= " --- $tp/mod.tgz";
if (defined $bpadds->{$node}->[0]->{addkcmdline}) {
$append .= $bpadds->{$node}->[0]->{addkcmdline};
my $modules;
my $kcmdline;
($kcmdline,$modules) = split /---/,$bpadds->{$node}->[0]->{addkcmdline},2;
if ($modules) {
$append .= " --- ".$modules;
}
$prepend .= " ".$kcmdline;
}
$append = $prepend.$append;
$output_handler->({node=>[{name=>[$node],'_addkcmdlinehandled'=>[1]}]});
$bptab->setNodeAttribs(

12
xCAT-server/lib/xcat/plugins/pxe.pm
View File

@ -1,12 +1,12 @@
# IBM(c) 2007 EPL license http://www.eclipse.org/legal/epl-v10.html
package xCAT_plugin::pxe;
use Data::Dumper;
use Sys::Syslog;
use Socket;
use File::Copy;
use File::Path;
use Getopt::Long;
my $addkcmdlinehandled;
my $request;
my $callback;
my $dhcpconf = "/etc/dhcpd.conf";
@ -77,9 +77,11 @@ sub setstate {
my %chainhash = %{shift()};
my %machash = %{shift()};
my $kern = $bphash{$node}->[0]; #$bptab->getNodeAttribs($node,['kernel','initrd','kcmdline']);
if ($kern->{addkcmdline}) { #Implement the kcmdline append here for
unless ($addkcmdlinehandled->{$node}) { #Tag to let us know the plugin had a special syntax implemented for addkcmdline
if ($kern->{addkcmdline}) { #Implement the kcmdline append here for
#most generic, least code duplication
$kern->{kcmdline} .= " ".$kern->{addkcmdline};
}
}
if ($kern->{kcmdline} =~ /!myipfn!/) {
my $ipfn = xCAT::Utils->my_ip_facing($node);
@ -210,7 +212,6 @@ sub setstate {
my $errored = 0;
sub pass_along {
my $resp = shift;
$callback->($resp);
if ($resp and ($resp->{errorcode} and $resp->{errorcode}->[0]) or ($resp->{error} and $resp->{error}->[0])) {
$errored=1;
}
@ -218,7 +219,12 @@ sub pass_along {
if ($_->{error} or $_->{errorcode}) {
$errored=1;
}
if ($_->{_addkcmdlinehandled}) {
$addkcmdlinehandled->{$_->{name}->[0]}=1;
return; #Don't send back to client this internal hint
}
}
$callback->($resp);
}