xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

fix issue [CORAL]incorrect petitboot configuration for nodeset shell in flat hierarchical #3414 (#3419)

Browse Source
This commit is contained in:
yangsong 2017-07-10 02:57:32 -05:00 committed by Bin Xu
parent d937a34cdb
commit 06ab2e627d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@ -490,12 +490,27 @@ sub setdestiny {
my $ent = $resents->{$_}->[0]; #$restab->getNodeAttribs($_,[qw(xcatmaster)]);
my $master;
my $kcmdline = "quiet ";
if (defined($master_entry)) {
$master = $master_entry;
}
#the node.xcatmaster take precedence
if ($ent and $ent->{xcatmaster}) {
$master = $ent->{xcatmaster};
}
#if node.xcatmaster not specified, take the ip address facing the node
unless($master){
my @nxtsrvd = xCAT::NetworkUtils->my_ip_facing($_);
unless ($nxtsrvd[0]) {
$master = $nxtsrvd[1];
}
}
#the site.master takes the last precedence
unless($master){
if (defined($master_entry)) {
$master = $master_entry;
}
}
$ent = $hments->{$_}->[0]; #$nodehm->getNodeAttribs($_,['serialport','serialspeed','serialflow']);
if ($ent and defined($ent->{serialport})) {
if ($arch eq "ppc64") {