From e979a2f338b04c0e49002aede4f5cbb03241c481 Mon Sep 17 00:00:00 2001 From: mxi1 Date: Wed, 30 Jun 2010 09:54:19 +0000 Subject: [PATCH] dhcp 4.x will use /etc/dhcp/dhcpd.conf as its config file, and redhat6/fedora12/fedora13 is using it git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6623 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/dhcp.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm index 0eaa40e54..c88b55062 100644 --- a/xCAT-server/lib/xcat/plugins/dhcp.pm +++ b/xCAT-server/lib/xcat/plugins/dhcp.pm @@ -39,6 +39,11 @@ my $tftpdir = xCAT::Utils->getTftpDir(); my $dhcpconffile = $^O eq 'aix' ? '/etc/dhcpsd.cnf' : '/etc/dhcpd.conf'; my %dynamicranges; #track dynamic ranges defined to see if a host that resolves is actually a dynamic address +# dhcp 4.x will use /etc/dhcp/dhcpd.conf as the config file +if ( $^O ne 'aix' and -d "/etc/dhcp" ) { + $dhcpconffile = '/etc/dhcp/dhcpd.conf'; +} + sub ipIsDynamic { my $ip = shift; my $number = inet_aton($ip);