From cbc5d65138b1f2091049f6561cb2de8cea072d9d Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Wed, 8 Aug 2018 20:13:43 -0400
Subject: [PATCH] SLE 15 at least has moved *back* out of /etc/dhcp

---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 285aa0df4..2084878a5 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -63,7 +63,7 @@ my $checkdomain=0;
 
 # dhcp 4.x will use /etc/dhcp/dhcpd.conf as the config file
 my $dhcp6conffile;
-if ($^O ne 'aix' and -d "/etc/dhcp") {
+if ($^O ne 'aix' and not -e $dhcpconffile and -d "/etc/dhcp") {
     $dhcpconffile  = '/etc/dhcp/dhcpd.conf';
     $dhcp6conffile = '/etc/dhcp/dhcpd6.conf';
 }