From abd30586c2ceb91301e48acc622cae2f1f41217c Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 25 Feb 2008 20:00:45 +0000
Subject: [PATCH] Fix duplicate next-server directives

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

diff --git a/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm b/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
index affdd3c4c..d19a2f354 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/dhcp.pm
@@ -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";