From 0153e21d729106ab6efb950d2a21c58acac997d8 Mon Sep 17 00:00:00 2001
From: sjing <sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 10 Sep 2010 02:55:40 +0000
Subject: [PATCH] Fix for "rmnimimage -x" with error of "no nim object".

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7400 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/Utils.pm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index f9d661ca4..dfe60281b 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -3383,6 +3383,14 @@ sub get_ServiceNode
     	chomp $nimprime;
 	}
 
+	# $master and $nimprime is possible to be the same (MN)
+	# but $master is IP addr, $nimprime is short hostname
+	# this results in %snhash may have two keys duplicated.
+	# so use ip for nimprime.
+
+	my $nimprimeip = xCAT::NetworkUtils->getipaddr($nimprime);
+    $nimprime = $nimprimeip;
+
     $noderestab = xCAT::Table->new('noderes');
 	$nodetab = xCAT::Table->new('nodetype');