From e32bf5d3df617729eb73aedce803632f09d27de5 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 22 Aug 2011 19:28:37 +0000 Subject: [PATCH] Use nodehm.serialport/serialspeed to configure esxi5 console configuration git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10339 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/esx.pm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm index 46e021bcb..877138230 100644 --- a/xCAT-server/lib/xcat/plugins/esx.pm +++ b/xCAT-server/lib/xcat/plugins/esx.pm @@ -4218,6 +4218,12 @@ sub mknetboot { my %donetftp=(); my $bpadds = $bptab->getNodesAttribs(\@nodes,['addkcmdline']); + my $nodehmtab = xCAT::Table->new('nodehm',-create=>0); + my $serialconfig; + if ($nodehmtab) { + $serialconfig = $nodehmtab->getNodesAttribs(\@nodes,['serialport','serialspeed']); + } + my %tablecolumnsneededforaddkcmdline; my %nodesubdata; foreach my $key (keys %$bpadds){ #First, we identify all needed table.columns needed to aggregate database call @@ -4350,6 +4356,16 @@ sub mknetboot { elsif ($osver =~ /esxi5/) { #do a more straightforward thing.. $kernel = "$tp/mboot.c32"; $append = "-c $tp/boot.cfg.stateless"; + if ($serialconfig->{$node}) { + my $comport = 1; + if (defined $serialconfig->{$node}->[0]->{serialport}) { + $comport = $serialconfig->{$node}->[0]->{serialport}+1; + $append .= " -S $comport tty2port=com$comport"; + } + if (defined $serialconfig->{$node}->[0]->{serialspeed}) { + $append .= " -s ".$serialconfig->{$node}->[0]->{serialspeed}." com".$comport."_baud=".$serialconfig->{$node}->[0]->{serialspeed}; + } + } } $output_handler->({node=>[{name=>[$node],'_addkcmdlinehandled'=>[1]}]});