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

-On x86, have a BOOTIF= variable available, and default to using it where possible

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5947 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-05-03 20:37:39 +00:00
parent 31d7ca715a
commit e213cb0f1c
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -837,7 +837,7 @@ sub mkinstall
}
else
{
$ksdev = "eth0";
$ksdev = "bootif"; #if not specified, fall back to bootif
}
if ($ksdev eq "")
{

1
xCAT-server/lib/xcat/plugins/pxe.pm
View File

@@ -169,6 +169,7 @@ sub setstate {
} else {
print $pcfg "\n";
}
print $pcfg " IPAPPEND 2\n";
}
close($pcfg);
my $inetn = inet_aton($node);

6
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -698,7 +698,7 @@ sub mkinstall
}
else
{
$netdev = "eth0";
$netdev = "bootif";
}
if ($netdev eq "") #why it is blank, no mac defined?
{
@@ -709,7 +709,9 @@ sub mkinstall
}
);
}
$kcmdline .= " netdevice=" . $netdev;
unless ($netdev eq "bootif") { #if going by bootif, BOOTIF will suffice
$kcmdline .= " netdevice=" . $netdev;
}
}
#TODO: driver disk handling should in SLES case be a mod of the install source, nothing to see here

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

@@ -198,11 +198,14 @@ sub setstate {
} else {
print $pcfg "\n";
}
print $pcfg "IPAPPEND 2\n";
} else { #other than comboot/multiboot, we won't have need of pxelinux
print $pcfg "imgfetch -n kernel http://".'${next-server}/tftpboot/'.$kern->{kernel}."\n";
print $pcfg "imgload kernel\n";
if ($kern->{kcmdline}) {
print $pcfg "imgargs kernel ".$kern->{kcmdline}."\n";
print $pcfg "imgargs kernel ".$kern->{kcmdline}." BOOTIF=${netX/mac}\n";
} else {
print $pcfg "imgargs kernel BOOTIF=${netX/mac}\n";
}
if ($kern->{initrd}) {
print $pcfg "imgfetch http://".'${next-server}'."/tftpboot/".$kern->{initrd}."\n";