From ecb66952c65ba88e567f7dd8cb8fe68684e894df Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 26 Mar 2009 20:27:55 +0000
Subject: [PATCH] -Use ntp/log server settings from tables if applicable

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

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 266ff3939..339166a22 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -796,8 +796,14 @@ sub addnet
         {
             push @netent, "    next-server  $tftp;\n";
         }
-		if ($myip){
+        if ($logservers) {
+        	push @netent, "    option log-servers $logservers;\n";
+        } elsif ($myip){
         	push @netent, "    option log-servers $myip;\n";
+        }
+        if ($ntpservers) {
+        	push @netent, "    option ntp-servers $ntpservers;\n";
+        } elsif ($myip){
         	push @netent, "    option ntp-servers $myip;\n";
         }
         push @netent, "    option domain-name \"$domain\";\n";