arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix problem erroneously requiring per-net config in ipv6 case not required in ipv4 case

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16295 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2013-05-14 15:13:28 +00:00
parent 86466c955c
commit 60609b1b24
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@@ -1679,7 +1679,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}"~;
@@ -1709,7 +1711,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";