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

Clean up unusued code

Browse Source 
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
This commit is contained in:
jbjohnso
2011-09-29 19:41:32 +00:00
parent fbeac6be1a
commit c68d849f2e
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/xnba.pm
View File

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