From fe2a9d9eaadbc6958a283959cfe5920ca41675dd Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 11 Feb 2011 18:06:26 +0000 Subject: [PATCH] -Skip putting ddns update zones in dhcp.pm if dnshandler not set to ddns git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8829 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/dhcp.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm index 9e88d7214..a0c38476d 100644 --- a/xCAT-server/lib/xcat/plugins/dhcp.pm +++ b/xCAT-server/lib/xcat/plugins/dhcp.pm @@ -1396,6 +1396,7 @@ sub addnet6 } my $ddnserver = $nameservers; $ddnserver =~ s/,.*//; + if ($::XCATSITEVALS{dnshandler} =~ /ddns/) { push @netent, " zone $domain. {\n"; push @netent, " primary $ddnserver; key xcat_key; \n"; push @netent, " }\n"; @@ -1404,6 +1405,7 @@ sub addnet6 push @netent, " primary $ddnserver; key xcat_key; \n"; push @netent, " }\n"; } + } if ($netcfgs{$net}->{range}) { push @netent," range6 ".$netcfgs{$net}->{range}.";\n"; } else { @@ -1610,6 +1612,7 @@ sub addnet } my $ddnserver = $nameservers; $ddnserver =~ s/,.*//; + if ($::XCATSITEVALS{dnshandler} =~ /ddns/) { push @netent, "zone $domain. {\n"; push @netent, " primary $ddnserver; key xcat_key; \n"; push @netent, " }\n"; @@ -1618,6 +1621,7 @@ sub addnet push @netent, " primary $ddnserver; key xcat_key; \n"; push @netent, " }\n"; } + } my $tmpmaskn = unpack("N", inet_aton($mask)); my $maskbits = 32;