From 70037094e569ac727b25cfc4a73b8816e406a3eb Mon Sep 17 00:00:00 2001
From: sjing <sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 13 Sep 2010 08:01:26 +0000
Subject: [PATCH] support flags when creating osimage.

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 76357ec6c..64da23c7d 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -2830,19 +2830,9 @@ sub mknimimage
         chomp $paging_name;
         $newres{paging} = $paging_name;
 
-        # update spot with additional software and sync files
-        if (
-            &spot_updates(
-                          $callback,   $::image_name, \%imagedef,
-                          \%::attrres, $lpp_source_name
-            ) != 0
-          )
-        {
-
-            # error - could not update spots
-            return 1;
-        }
-
+        # need to update spot if needed
+        # but put it later, after xcat osimage obj defined since xcatchroot needs it.
+        
         #
         # end diskless section
         #
@@ -3037,6 +3027,26 @@ sub mknimimage
         return 1;
     }
 
+    # put diskless spot update after xcat obj def
+    # since xcatchroot needs osimage defined first
+
+    if (($::NIMTYPE eq "diskless") || ($::NIMTYPE eq "dataless"))
+    {
+        # update spot with additional software and sync files
+        if (
+            &spot_updates(
+                          $callback,   $::image_name, \%imagedef,
+                          \%::attrres, $lpp_source_name
+            ) != 0
+          )
+        {
+
+            # error - could not update spots
+            return 1;
+        }
+    }    
+
+
 	#
 	# Set root password in diskless images
 	#