From 0291668bb04efd757bf8766af1f1b95c85c209d8 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 27 Oct 2010 20:01:48 +0000
Subject: [PATCH] Handle case where a user profile is included and the NICDEF
 statement is outside the profile.

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

diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm
index 10ffa01d3..84c4d61c5 100644
--- a/xCAT-server/lib/xcat/plugins/zvm.pm
+++ b/xCAT-server/lib/xcat/plugins/zvm.pm
@@ -2920,6 +2920,9 @@ sub nodeSet {
 		if ($userProfile) {
 			@words = split( ' ', xCAT::zvmUtils->trimStr($userProfile) );
 			$out = `ssh $hcp "$::DIR/getuserprofile $words[1]" | grep "NICDEF" | grep "$hcpNetName"`;
+			if (!$out) {
+				$out = `echo "$userEntry" | grep "NICDEF" | grep "$hcpNetName"`;
+			}
 		}
 		else {
 			$out = `echo "$userEntry" | grep "NICDEF" | grep "$hcpNetName"`;