xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-19 04:40:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1838 from immarvin/onrhstatic

Browse Source 
No additional comments for 5 days. Merging.
This commit is contained in:
Mark Gurevich
2016-09-21 16:49:22 -04:00
committed by GitHub
parent 4c43632cd2 2298d9eb24
commit 4098416bdf
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1530,16 +1530,15 @@ sub mkinstall
if (xCAT::Utils->version_cmp($kversion, "7.0") < 0) {
$kcmdline .= " ip=$ipaddr netmask=$netmask gateway=$gateway hostname=$hostname ";
} else {
unless ($nicname) {
$nicname = "bootnic";
my $mactab = xCAT::Table->new("mac");
my $macref = $mactab->getNodeAttribs($node, ['mac']);
my $mac = xCAT::Utils->parseMacTabEntry($macref->{mac}, $node);
$kcmdline .= " ifname=$nicname:$mac";
$kcmdline .= " ip=$ipaddr" . "::" . "$gateway" . ":" . "$netmask" . ":" . "$hostname" . ":";
if($nicname){
$kcmdline .= "$nicname";
}
$kcmdline .= " ip=$ipaddr" . "::" . "$gateway" . ":" . "$netmask" . ":" . "$hostname" . ":" . "$nicname" . ":" . "none";
$kcmdline .= " bootdev=$nicname ";
$kcmdline .=":none::";
if($net_params->{mac}){
$kcmdline .="$net_params->{mac}";
}
}
my %nameservers = %{ xCAT::NetworkUtils->getNodeNameservers([$node]) };