From 3af54f8e00f8a336bbd8de5f25fbcae72ebcc757 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 22 Oct 2012 20:09:00 +0000
Subject: [PATCH] Fix copyesxiboot to work fine with mod.tgz

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@14086 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/anaconda.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index ddd406990..75f429034 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -1074,7 +1074,7 @@ sub mkinstall
             {
                 mkpath("$tftpdir/xcat/$os/$arch");
                 if($esxi){
-                    copyesxiboot($pkgdir, "$tftpdir/xcat/$os/$arch");		
+                    copyesxiboot($pkgdir, "$tftpdir/xcat/$os/$arch",osver=>$os);		
                 }else{
                     copy($kernpath,"$tftpdir/xcat/$os/$arch");
                     copy($initrdpath,"$tftpdir/xcat/$os/$arch/initrd.img");
@@ -1485,10 +1485,13 @@ sub getplatform {
 sub copyesxiboot {
     my $srcdir = shift;
     my $targetdir = shift;
+    my %args=@_;
+    my $os='esxi';
+    if ($args{osver}) { $os=$args{osver} }
     # this just does the same thing that the stateless version does.
     unless(-f "$targetdir/mod.tgz"){
 	require xCAT_plugin::esx;
-        xCAT_plugin::esx::makecustomizedmod('esxi', $targetdir);
+        xCAT_plugin::esx::makecustomizedmod($os, $targetdir);
     }
     my @files = qw(mboot.c32 vmkboot.gz vmkernel.gz sys.vgz cim.vgz ienviron.vgz install.vgz);
     foreach my $f (@files){