xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-08 11:18:31 +00:00
Code Issues Releases Wiki Activity

Again, fix BOOTIF based mac indication on x86

Browse Source
This commit is contained in:
Jarrod Johnson
2017-07-18 15:20:01 -04:00
parent 9184cbe03f
commit f7ff06d452
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/perl/xCAT/Template.pm
View File

@@ -1018,16 +1018,18 @@ sub kickstartnetwork {
unless ($mactab) { $tmplerr = "mac table should always exist prior to template processing when doing autoula"; return; }
my $ent = $mactab->getNodeAttribs($node, ['mac'], prefetchcache => 1);
unless ($ent and $ent->{mac}) { $tmplerr = "missing mac data for $node"; return; }
my $suffix = xCAT::Utils->parseMacTabEntry($ent->{mac}, $node);
$suffix = lc($suffix);
if ($::XCATSITEVALS{managedaddressmode} eq "autoula") {
my $suffix = xCAT::Utils->parseMacTabEntry($ent->{mac}, $node);
$suffix = lc($suffix);
unless ($hoststab) { $hoststab = xCAT::Table->new('hosts', -create => 1); }
$line .= "static --device=$suffix --noipv4 --ipv6=";
my $ulaaddr = autoulaaddress($suffix);
$hoststab->setNodeAttribs($node, { ip => $ulaaddr });
$line .= $ulaaddr;
} elsif ($::XCATSITEVALS{managedaddressmode} =~ /static/) {
my $suffix = xCAT::Utils->parseMacTabEntry($ent->{mac}, $node);
$suffix = lc($suffix);
my ($ipaddr, $hostname, $gateway, $netmask) = xCAT::NetworkUtils->getNodeNetworkCfg($node);
unless ($ipaddr) { $tmplerr = "cannot resolve the network configuration of $node"; return; }
@@ -1063,7 +1065,7 @@ sub kickstartnetwork {
#return "#KSNET static unsupported";
} else {
$line .= "dhcp --device=$suffix";
$line .= "dhcp"; # --device=$suffix";
}
return $line;
}