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

Fix duplicate next-server directives

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@570 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2008-02-25 20:00:45 +00:00
parent 8ed1e37aa4
commit abd30586c2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,15 +83,16 @@ sub addnode {
my $node = shift;
my $ent;
my $nrtab = xCAT::Table->new('noderes');
my $lstatements = $statements;
if ($nrtab) {
my $ent;
$ent = $nrtab->getNodeAttribs($node,['tftpserver']);
if ($ent and $ent->{tftpserver}) {
$statements = 'next-server '.inet_ntoa(inet_aton($ent->{tftpserver})).';'.$statements;
$lstatements = 'next-server '.inet_ntoa(inet_aton($ent->{tftpserver})).';'.$statements;
} else {
my $nxtsrv = xCAT::Utils->my_ip_facing($node);
if ($nxtsrv) {
$statements = "next-server $nxtsrv;$statements";
$lstatements = "next-server $nxtsrv;$statements";
}
}
#else {
@@ -146,8 +147,8 @@ sub addnode {
print $omshell "set hardware-address = ".$mac."\n";
print $omshell "set hardware-type = 1\n";
print $omshell "set ip-address = $ip\n";
if ($statements) {
print $omshell "set statements = \"$statements\"\n";
if ($lstatements) {
print $omshell "set statements = \"$lstatements\"\n";
}
print $omshell "create\n";