xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2484 from chenglch/xcattable

Browse Source 
Update bootparams in destiny to support discovery without DB access
This commit is contained in:
zet809 2017-02-17 16:20:03 +08:00 committed by GitHub
commit 040bd52546
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,7 +434,6 @@ sub setdestiny {
}
} elsif ($state eq "shell" or $state eq "standby" or $state =~ /^runcmd/ or $state =~ /^runimage/) {
$restab = xCAT::Table->new('noderes', -create => 1);
my $bootparms = xCAT::Table->new('bootparams', -create => 1);
my $nodetype = xCAT::Table->new('nodetype');
#my $sitetab = xCAT::Table->new('site');
@ -506,18 +505,18 @@ sub setdestiny {
}
}
if (-r "$tftpdir/xcat/genesis.fs.$arch.$bestsuffix") {
$bootparms->setNodeAttribs($_, { kernel => "xcat/genesis.kernel.$arch",
initrd => "xcat/genesis.fs.$arch.$bestsuffix",
kcmdline => $kcmdline . "xcatd=$master:$xcatdport destiny=$state" });
$bphash->{$_}->[0]->{kernel} = "xcat/genesis.kernel.$arch";
$bphash->{$_}->[0]->{initrd} = "xcat/genesis.fs.$arch.$bestsuffix";
$bphash->{$_}->[0]->{kcmdline} = $kcmdline . "xcatd=$master:$xcatdport destiny=$state";
} else {
$bootparms->setNodeAttribs($_, { kernel => "xcat/genesis.kernel.$arch",
initrd => "xcat/genesis.fs.$arch.$othersuffix",
kcmdline => $kcmdline . "xcatd=$master:$xcatdport destiny=$state" });
$bphash->{$_}->[0]->{kernel} = "xcat/genesis.kernel.$arch";
$bphash->{$_}->[0]->{initrd} = "xcat/genesis.fs.$arch.$othersuffix";
$bphash->{$_}->[0]->{kcmdline} = $kcmdline . "xcatd=$master:$xcatdport destiny=$state";
}
} else { #'legacy' environment
$bootparms->setNodeAttribs($_, { kernel => "xcat/nbk.$arch",
initrd => "xcat/nbfs.$arch.gz",
kcmdline => $kcmdline . "xcatd=$master:$xcatdport" });
$bphash->{$_}->[0]->{kernel} = "xcat/nbk.$arch";
$bphash->{$_}->[0]->{initrd} = "xcat/nkfs.$arch.gz";
$bphash->{$_}->[0]->{kcmdline} = $kcmdline . "xcatd=$master:$xcatdport";
}
}