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

Fix pxelinux files made by xnba using '!myipfn!' shortcut (at least best effort)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10699 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2011-10-04 18:13:37 +00:00
parent a42f007217
commit b5206140dc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,10 +130,16 @@ sub setstate {
}
}
my $elilokcmdline = $kern->{kcmdline}; #track it separate, since vars differ
my $pxelinuxkcmdline = $kern->{kcmdline}; #track it separate, since vars differ
if ($kern->{kcmdline} =~ /!myipfn!/) {
my $ipfn = '${next-server}';#xCAT::Utils->my_ip_facing($node);
$kern->{kcmdline} =~ s/!myipfn!/$ipfn/g;
$elilokcmdline =~ s/!myipfn!/%N/;
$elilokmdline =~ s/!myipfn!/%N/;
$ipfn = xCAT::Utils->my_ip_facing($node);
unless ($ipfn) { $ipfn = $::XCATSITEVALS{master}; }
if ($ipfn) {
$pxelinuxkcmdline =~ s/!myipfn!/$ipfn/;
}
}
my $pcfg;
unlink($tftpdir."/xcat/xnba/nodes/".$node.".pxelinux");
@@ -164,7 +170,7 @@ sub setstate {
close($pcfg);
open($pcfg,'>',$tftpdir."/xcat/xnba/nodes/".$node.".pxelinux");
print $pcfg "DEFAULT xCAT\nLABEL xCAT\n KERNEL mboot.c32\n";
print $pcfg " APPEND $hypervisor --- $kernel ".$kern->{kcmdline}." --- ".$kern->{initrd}."\n";
print $pcfg " APPEND $hypervisor --- $kernel ".$pxelinuxkcmdline." --- ".$kern->{initrd}."\n";
} else {
if ($kern->{kernel} =~ /\.c32\z/ or $kern->{kernel} =~ /memdisk\z/) { #gPXE comboot support seems insufficient, chain pxelinux instead
print $pcfg " set 209:string xcat/xnba/nodes/$node.pxelinux\n";
@@ -184,7 +190,7 @@ sub setstate {
print $pcfg "initrd=".$kern->{initrd}." ";
}
if ($kern and $kern->{kcmdline}) {
print $pcfg $kern->{kcmdline}."\n";
print $pcfg $pxelinuxkcmdline."\n";
} else {
print $pcfg "\n";
}