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

-Fix dhcp syntax mistakes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6212 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2010-05-24 18:31:16 +00:00
parent 5099cc1cfc
commit 4ed85bba5e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1048,10 +1048,9 @@ sub addnet
{
push @netent, " option domain-name-servers $nameservers;\n";
}
push @netent, "zone $domain. {\n";
my $ddnserver = $nameservers;
$ddnserver =~ s/,.*//;
push @netent, "$domain. {\n";
push @netent, "zone $domain. {\n";
push @netent, " primary $ddnserver; key xcat_key; \n";
push @netent, " }\n";
my $tmpmaskn = unpack("N", inet_aton($mask));
@ -1236,7 +1235,6 @@ sub newconfig
push @dhcpconf, "omapi-port 7911;\n"; #Enable omapi...
push @dhcpconf, "key xcat_key {\n";
push @dhcpconf, " algorithm hmac-md5;\n";
push @dhcpconf, ('class "pxe" {'."\n"," match if substring (option vendor-class-identefier, 0, 9) = \"PXEclient\";\n"," ddns-updates off;\n"," max-lease-time 600;\n");
(my $passent) =
$passtab->getAttribs({key => 'omapi', username => 'xcat_key'}, 'password');
my $secret = encode_base64(genpassword(32)); #Random from set of 62^32
@ -1257,6 +1255,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");
}
sub newconfig_aix