From c908e66f621e9c071a3401137f06ba1e0646d998 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 22 Apr 2011 19:09:30 +0000
Subject: [PATCH] Fix esxi5 support for kernel/kcmdline set

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9389 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/esx.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index d6c230f57..09e3b5f3a 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -3966,6 +3966,8 @@ sub mknetboot {
 			$donetftp{$osver,$arch,$profile} = 1;
 		}
 		my $tp = "xcat/netboot/$osver/$arch/$shortprofname";
+	my $kernel;
+	my $kcmdline;
 	if ($osver =~ /esxi4/) {
 	  my $bail=0;
 	  foreach (@reqmods) {
@@ -3978,7 +3980,7 @@ sub mknetboot {
 	    return;
 	  }	
 	      # now make <HEX> file entry stuff
-		my $kernel = "$tp/mboot.c32";
+		$kernel = "$tp/mboot.c32";
 		my $prepend = "$tp/vmkboot.gz";
         delete $mods{"vmkboot.gz"};
 		my $append = " --- $tp/vmk.gz";
@@ -3996,7 +3998,7 @@ sub mknetboot {
         }
 		if (defined $bpadds->{$node}->[0]->{addkcmdline}) {
             my $modules;
-            my $kcmdline;
+            $kcmdline;
             ($kcmdline,$modules) = split /---/,$bpadds->{$node}->[0]->{addkcmdline},2;
             $kcmdline =~ s/#NODEATTRIB:([^:#]+):([^:#]+)#/$nodesubdata{$1}->{$node}->[0]->{$2}/eg;
             if ($modules) {
@@ -4007,8 +4009,8 @@ sub mknetboot {
         $append = $prepend.$append;
 	}
 	elsif ($osver =~ /esxi5/) { #do a more straightforward thing..
-	  my $kernel = "$tp/mboot.c32";
-	  my $kcmdline = "-c $tp/boot.cfg.stateless";
+	  $kernel = "$tp/mboot.c32";
+	  $kcmdline = "-c $tp/boot.cfg.stateless";
 	}
 	$output_handler->({node=>[{name=>[$node],'_addkcmdlinehandled'=>[1]}]});