From 56500ea6bf99ce3270bd3b904352eb1676ee89a5 Mon Sep 17 00:00:00 2001
From: cxhong <abcdqiu@gmail.com>
Date: Mon, 12 Jun 2017 09:08:53 -0400
Subject: [PATCH] Failed to run dhcpd if tftpserver defined as <xcatmaster> in
 the network (#3223)

table
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 301796b0a..291a9b370 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -2457,10 +2457,11 @@ sub addnet
             {
                 $tftp = $ent->{tftpserver};
             }
-            else
-            {    #presume myself to be it, dhcp no longer does this for us
+            if (!$tftp || ($tftp eq '<xcatmaster>'))
+            {
                 $tftp = $myip;
             }
+
             if ($ent and $ent->{gateway})
             {
                 $gateway = $ent->{gateway};