From 997bf0f11bb9065ec9d0e34374e204023182a16b Mon Sep 17 00:00:00 2001
From: sjing <sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 10 May 2011 08:30:28 +0000
Subject: [PATCH] support <xcatmaster> keyword in site/networks table.

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 6b9dc178b..205d3f8e8 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -4072,7 +4072,18 @@ sub mk_resolv_conf_file
     my ($tmp) = $sitetab->getAttribs({'key' => 'domain'}, 'value');
     my $domain = $tmp->{value};
     my ($tmp2) = $sitetab->getAttribs({'key' => 'nameservers'}, 'value');
-    my $nameservers = $tmp2->{value};
+
+    # convert <xcatmaster> to nameserver IP
+    my $nameservers;
+    if ($tmp2->{value} eq '<xcatmaster>')
+    {
+        $nameservers = xCAT::InstUtils->convert_xcatmaster();
+    }
+    else
+    {
+        $nameservers = $tmp2->{value};
+    }
+
     $sitetab->close;
 
     # if set then create file
@@ -4210,7 +4221,18 @@ sub chk_resolv_conf
 	my ($tmp) = $sitetab->getAttribs({'key' => 'domain'}, 'value');
     my $site_domain = $tmp->{value};
 	my ($tmp2) = $sitetab->getAttribs({'key' => 'nameservers'}, 'value');
-    my $site_nameservers = $tmp2->{value};
+	
+    # convert <xcatmaster> to nameserver IP
+    my $site_nameservers;
+    if ($tmp2->{value} eq '<xcatmaster>')
+    {
+        $site_nameservers = xCAT::InstUtils->convert_xcatmaster();
+    }
+    else
+    {
+        $site_nameservers = $tmp2->{value};
+    }
+    
     $sitetab->close;
 
 	#  Get a list of the all NIM resources
@@ -4500,7 +4522,16 @@ sub mk_resolv_conf
         my ($tmp) = $sitetab->getAttribs({'key' => 'domain'}, 'value');
         my $domain = $tmp->{value};
         my ($tmp2) = $sitetab->getAttribs({'key' => 'nameservers'}, 'value');
-        my $nameservers = $tmp2->{value};
+        # convert <xcatmaster> to nameserver IP
+        my $nameservers;
+        if ($tmp2->{value} eq '<xcatmaster>')
+        {
+            $nameservers = xCAT::InstUtils->convert_xcatmaster();
+        }
+        else
+        {
+            $nameservers = $tmp2->{value};
+        }
         $sitetab->close;
 
         # if set then we want a resolv_conf file