From eae067c880e4c248e6a1a4daea58fa33cdffb6d8 Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 20 Sep 2011 14:31:30 +0000
Subject: [PATCH] skip 2nd resolv_conf in bos_inst

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 8ca4ab185..0cfe18cae 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -877,6 +877,13 @@ sub nimnodeset
                 if ($resname)
                 {
 
+					# don't add resolv.conf here!!
+					#   - it is done below
+					if ($restype eq 'resolv_conf')
+					{
+						next;
+					}
+
                     # handle multiple script & installp_bundles
                     if ($restype eq 'script')
                     {
@@ -7493,16 +7500,6 @@ sub prenimnodeset
         xCAT::MsgUtils->message("E", $rsp, $callback);
         return (1);
     }
-    else
-    {
-        if ($::VERBOSE)
-        {
-            my $rsp;
-            push @{$rsp->{data}},
-              "NIM resources are copied to the xCAT service nodes successfully.\n";
-            xCAT::MsgUtils->message("I", $rsp, $callback);
-        }
-    }
 
     # pass this along to the process_request routine
     return (0, \%objhash, \%nethash, \%imghash, \%lochash, \%attrs, \%nimhash, \@nodelist, $type);