From d1228353b204e6845f8040009d596e9fda10b359 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 12 Jul 2011 20:18:36 +0000 Subject: [PATCH] Add CentOS 6.0 support git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10060 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 1 + xCAT-server/lib/xcat/plugins/ddns.pm | 2 ++ 2 files changed, 3 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 13646de30..1824cbe91 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -28,6 +28,7 @@ use Socket; my @cpiopid; my %distnames = ( + "1310229985.226287" => "centos6", "1176234647.982657" => "centos5", "1156364963.862322" => "centos4.4", "1178480581.024704" => "centos4.5", diff --git a/xCAT-server/lib/xcat/plugins/ddns.pm b/xCAT-server/lib/xcat/plugins/ddns.pm index c4c811645..4c86bbea2 100644 --- a/xCAT-server/lib/xcat/plugins/ddns.pm +++ b/xCAT-server/lib/xcat/plugins/ddns.pm @@ -924,6 +924,8 @@ sub find_nameserver_for_dns { unless (defined $ctx->{nsmap}->{$zone}) { #ok, we already thought about this zone and made a decision if ($zone =~ /^\.*192.IN-ADDR.ARPA\.*/ or $zone =~ /^\.*172.IN-ADDR.ARPA\.*/ or $zone =~ /127.IN-ADDR.ARPA\.*/ or $zone =~ /^\.*IN-ADDR.ARPA\.*/ or $zone =~ /^\.*ARPA\.*/) { $ctx->{nsmap}->{$zone} = 0; #ignore zones that are likely to appear, but probably not ours + } elsif ($::XCATSITEVALS{ddnsserver}) { + $ctx->{nsmap}->{$zone} = $::XCATSITEVALS{ddnsserver}; } else { my $reply = $ctx->{resolver}->query($zone,'NS'); if ($reply) {