From 2cca891e35ad8b4e1c242f3ae5220f84b705c0e1 Mon Sep 17 00:00:00 2001
From: sjing <sjing@cn.ibm.com>
Date: Thu, 2 Jan 2014 01:23:43 -0500
Subject: [PATCH] Fix for bug 3952

Made makedhcp be able to handle the case where site.nameservers or
networks.nameservers is a comma delimited list with <xcatmaster>
keyword in it.
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index aab1c551c..9e66d70ce 100755
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2176,10 +2176,7 @@ sub addnet
             }
 
             # convert <xcatmaster> to nameserver IP
-            if ($nameservers eq '<xcatmaster>')
-            {
-                $nameservers = $myip;
-            }
+            $nameservers =~ s/<xcatmaster>/$myip/g;
 
             if (!$ntpservers || ($ntpservers eq '<xcatmaster>'))
             {