From 08c759d2214841d06303eb18e0013d7a56542847 Mon Sep 17 00:00:00 2001
From: sjing <sjing@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 9 Feb 2012 07:53:28 +0000
Subject: [PATCH] support site.ntpservers=<xcatmaster>

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

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index fb1e62391..9ed8aa354 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1713,6 +1713,11 @@ sub addnet
             {
                 $nameservers = $myip;
             }
+
+            if (!$ntpservers || ($ntpservers eq '<xcatmaster>'))
+            {
+                $ntpservers = $myip;
+            }
             
             $nameservers=putmyselffirst($nameservers);
             $ntpservers=putmyselffirst($ntpservers);
@@ -1821,8 +1826,6 @@ sub addnet
         }
         if ($ntpservers) {
         	push @netent, "    option ntp-servers $ntpservers;\n";
-        } elsif ($myip){
-        	push @netent, "    option ntp-servers $myip;\n";
         }
         if ($nameservers)
         {