From 06c90dd2e6d0b394cb03986ad5817c4ab24b8efe Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 14 May 2013 15:13:39 +0000
Subject: [PATCH] Fix problem erroneously requiring per-net config in ipv6 case
 not required in ipv4 case

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16296 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/dhcp.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/dhcp.pm b/xCAT-server/lib/xcat/plugins/dhcp.pm
index 22aae42cc..c9651caed 100644
--- a/xCAT-server/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server/lib/xcat/plugins/dhcp.pm
@@ -1669,7 +1669,9 @@ sub addnet6
     #posix timezone rfc 4833/tzdb timezone
     #phase 3 will include whatever is required to do Netboot6.  That might be in the october timeframe for lack of implementations to test
     #boot url/param (rfc 59070)
-    push @netent, "    option domain-name \"".$netcfgs{$net}->{domain}."\";\n";
+    my $netdomain = $netcfgs{$net}->{domain};
+    unless ($netdomain) { $netdomain = $site_domain; }
+    push @netent, "    option domain-name \"".$netdomain."\";\n";
 	#  add domain-search
 	# We want something like "option domain-search "foo.com", "bar.com";"
 	my $domainstring = qq~"$netcfgs{$net}->{domain}"~;
@@ -1699,7 +1701,7 @@ sub addnet6
             push @netent, "    ddns-domainname \"".$ddnsdomain."\";\n";
             push @netent, "    zone $ddnsdomain. {\n";
         } else {
-			push @netent, "    zone $netcfgs{$net}->{domain}. {\n";
+			push @netent, "    zone $netdomain. {\n";
         }
     push @netent, "       primary $ddnserver; key xcat_key; \n";
     push @netent, "    }\n";