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

-Fix netboot DDNS suppression in DHCP

Browse Source 
-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
This commit is contained in:
jbjohnso 2010-06-08 19:14:48 +00:00
parent 2d9bc06c0b
commit 87ac9bc930
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

5
xCAT-server/lib/xcat/plugins/dns.pm
View File

@ -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;