From c1898ae347a2e9282f320ecdc2027708e3dc2abc Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 17 May 2010 14:58:30 +0000
Subject: [PATCH] -Alas, the CIM stuff was not superfluous

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

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 4dda47f3b..172a9f8ce 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -2356,7 +2356,7 @@ sub mknetboot {
 		}
 
 		mkpath("$tftpdir/xcat/netboot/$osver/$arch/");
-        my @reqmods = qw/vmkboot.gz vmk.gz sys.vgz/; #Required modules for an image to be considered complete
+        my @reqmods = qw/vmkboot.gz vmk.gz sys.vgz cim.vgz oem.tgz license.tgz/; #Required modules for an image to be considered complete
         my %mods;
         foreach (@reqmods) {
             $mods{$_} = 1;
@@ -2398,6 +2398,12 @@ sub mknetboot {
         delete $mods{"vmk.gz"};
 		$append .= " --- $tp/sys.vgz";
         delete $mods{"sys.vgz"};
+		$append .= " --- $tp/cim.vgz";
+        delete $mods{"cim.vgz"};
+		$append .= " --- $tp/oem.tgz";
+        delete $mods{"oem.tgz"};
+		$append .= " --- $tp/license.tgz";
+        delete $mods{"license.tgz"};
         if ($mods{"mod.tgz"}) {
 		    $append .= " --- $tp/mod.tgz";
             delete $mods{"mod.tgz"};
@@ -2445,11 +2451,11 @@ sub cpNetbootImages {
 		unless(   -r "$destDir/vmk.gz" 
 			and -r "$destDir/vmkboot.gz"
 			and -r "$destDir/sys.vgz"
-			#and -r "$destDir/license.tgz"
-			#and -r "$destDir/oem.tgz"
+			and -r "$destDir/license.tgz"
+			and -r "$destDir/oem.tgz"
 			and -r "$destDir/pkgdb.tgz"
-			#and -r "$destDir/cim.vgz"
-			#and -r "$destDir/cimstg.tgz"
+			and -r "$destDir/cim.vgz"
+			and -r "$destDir/cimstg.tgz"
 			and -r "$destDir/boot.cfg"
 		){
             if (-r "$srcDir/image.tgz") { #it still may work without image.tgz if profile customization has everything replaced