From c68d849f2e305f1b13c78ab833fcd19ebfa7dba2 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 29 Sep 2011 19:41:32 +0000
Subject: [PATCH] Clean up unusued code Fix for elilo not knowing what
 'next-server' would possible mean

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

diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm
index 6cd1f07b6..b20b0c1e4 100644
--- a/xCAT-server/lib/xcat/plugins/xnba.pm
+++ b/xCAT-server/lib/xcat/plugins/xnba.pm
@@ -129,21 +129,11 @@ sub setstate {
 
     }
   }
+  my $elilokcmdline = $kern->{kcmdline}; #track it separate, since vars differ
   if ($kern->{kcmdline} =~ /!myipfn!/) {
       my $ipfn = '${next-server}';#xCAT::Utils->my_ip_facing($node);
-      unless ($ipfn) {
-        my @myself = xCAT::Utils->determinehostname();
-        my $myname = $myself[(scalar @myself)-1];
-         $callback->(
-                {
-                 error => [
-                     "$myname: Unable to determine or reasonably guess the image server for $node"
-                 ],
-                 errorcode => [1]
-                }
-                );
-      }
       $kern->{kcmdline} =~ s/!myipfn!/$ipfn/g;
+      $elilokcmdline =~ s/!myipfn!/%N/;
   }
   my $pcfg;
   unlink($tftpdir."/xcat/xnba/nodes/".$node.".pxelinux");
@@ -233,7 +223,7 @@ sub setstate {
 	       print $ucfg "image=/tftpboot/".$kern->{kernel}."\n";
 	       print $ucfg "   label=\"xCAT\"\n";
 	       print $ucfg "   initrd=/tftpboot/".$kern->{initrd}."\n";
-	       print $ucfg "   append=\"".$kern->{kcmdline}.' BOOTIF=%B"'."\n";
+	       print $ucfg "   append=\"".$elilokcmdline.' BOOTIF=%B"'."\n";
 	       close($ucfg);
 	    }
         }