From 4fc0a01a0db6d3c029c3eb45d6ea512ad71f98e6 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 17 Oct 2011 09:14:04 +0000
Subject: [PATCH] Remove the mknimimage -u limtion for diskful images.  This is
 to allow diskful installation over HFI.

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index aff48a92a..644f141da 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -1540,6 +1540,7 @@ sub spot_updates
 
 			# if there is a shared_root then remove that also
 			#   - see if the shared_root exist and if it is allocated
+	    if ( $SRname ) {
 			my $alloc_count = xCAT::InstUtils->get_nim_attr_val($SRname, "alloc_count", $callback, $sn, $subreq);
 
 			if (defined($alloc_count)) {  # then the res exists
@@ -1570,6 +1571,7 @@ sub spot_updates
                 		xCAT::MsgUtils->message("E", $rsp, $callback);
             		}
 				}
+	        }
             }
         }
     } # end UPDATE
@@ -2652,15 +2654,15 @@ sub mknimimage
     {
 
         # don't update spot unlees it is for diskless/dataless
-        if ($imagedef{$::image_name}{nimtype} eq "standalone")
-        {
-            my $rsp;
-            push @{$rsp->{data}},
-              "The \'-u\' option is only valid for diskless and dataless nodes.\n";
-            xCAT::MsgUtils->message("E", $rsp, $callback);
-            &mknimimage_usage($callback);
-            return 1;
-        }
+#        if ($imagedef{$::image_name}{nimtype} eq "standalone")
+#        {
+#            my $rsp;
+#            push @{$rsp->{data}},
+#              "The \'-u\' option is only valid for diskless and dataless nodes.\n";
+#            xCAT::MsgUtils->message("E", $rsp, $callback);
+#            &mknimimage_usage($callback);
+#            return 1;
+#        }
 
         # if it doesn't exist we can't update it!
         if (!$is_defined)