From be3e39bc3ddfa52bf2eee063648df5893322446f Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 Jun 2010 12:49:23 +0000
Subject: [PATCH] -Make dhcp host declarations more similar to each other by
 relying upon differences at the network declaration level

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

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 338f85b44..177d0bec6 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -209,15 +209,15 @@ sub addnode
             $hname = $node . "-noip".$mac;
             $hname =~ s/://g;
             $ip='DENIED';
-        }
-        if ($guess_next_server and $ip and $ip ne "DENIED")
-        {
-            $nxtsrv = xCAT::Utils->my_ip_facing($hname);
-            if ($nxtsrv)
-            {
-                $tftpserver = $nxtsrv;
-                $lstatements = "next-server $nxtsrv;$statements";
-            }
+#        } #if 'guess_next_server', inherit from the network provided value... see how this pans out
+#       if ($guess_next_server and $ip and $ip ne "DENIED")
+#       {
+#           $nxtsrv = xCAT::Utils->my_ip_facing($hname);
+#           if ($nxtsrv)
+#           {
+#               $tftpserver = $nxtsrv;
+#               $lstatements = "next-server $nxtsrv;$statements";
+#           } #of course, we set the xNBA variable to let that propogation carry forward into filename uri interpolation
         } elsif ($guess_next_server) {
             $nxtsrv='${next-server}'; #if floating IP support, cause gPXE command-line expansion patch to drive inheritence from network
         }