From 87ac9bc9300d5aa2593de5757881be89d83a5fe2 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 8 Jun 2010 19:14:48 +0000
Subject: [PATCH] -Fix netboot DDNS suppression in DHCP -Change zone filenames
 to go full domain in dns.pm for now

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6396 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 2 +-
 xCAT-server/lib/xcat/plugins/dns.pm  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 177d0bec6..318be065e 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1260,7 +1260,7 @@ sub newconfig
     push @dhcpconf, "  secret \"" . $secret . "\";\n";
     push @dhcpconf, "};\n";
     push @dhcpconf, "omapi-key xcat_key;\n";
-    push @dhcpconf, ('class "pxe" {'."\n","   match if substring (option vendor-class-identifier, 0, 9) = \"PXEclient\";\n","   ddns-updates off;\n","    max-lease-time 600;\n","}\n");
+    push @dhcpconf, ('class "pxe" {'."\n","   match if substring (option vendor-class-identifier, 0, 9) = \"PXEClient\";\n","   ddns-updates off;\n","    max-lease-time 600;\n","}\n");
 }
 
 sub newconfig_aix
diff --git a/xCAT-server/lib/xcat/plugins/dns.pm b/xCAT-server/lib/xcat/plugins/dns.pm
index 991bf991a..e36f9125e 100644
--- a/xCAT-server/lib/xcat/plugins/dns.pm
+++ b/xCAT-server/lib/xcat/plugins/dns.pm
@@ -289,8 +289,9 @@ sub update_zones {
             my @octets = split/\./,$currzone;
             $currzone = join('.',reverse(@octets));
             $zonefilename = $currzone;
-        } else {
-            $zonefilename =~ s/\..*//; #compatible with bind.pm
+        #If needed, the below, but it was a fairly painfully restricted paradigm for zonefile names...
+        #} elsif (not $zonefilename =~ /_/) {
+        #    $zonefilename =~ s/\..*//; #compatible with bind.pm
         }
         unless (-f $dbdir."/db.$zonefilename") {
             my $zonehdl;