xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-24 12:10:25 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4643 from jjohnson42/fixmacdatacheck

Browse Source 
Fix IMM MAC data check
This commit is contained in:
zet809
2018-01-19 15:23:53 +08:00
committed by GitHub
parent c669a22fe0 e718235ae2
commit 7928a734c9
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
perl-xCAT/xCAT/Schema.pm
View File

@@ -1152,6 +1152,7 @@ passed as argument rather than by table value',
" defserialflow: The default serial flow - currently only used by the mknb command.\n\n" .
" defserialport: The default serial port - currently only used by mknb.\n\n" .
" defserialspeed: The default serial speed - currently only used by mknb.\n\n" .
" disablenodesetwarning: Allow the legacy xCAT non-osimage style nodeset to execute.\n\n" .
" genmacprefix: When generating mac addresses automatically, use this manufacturing\n" .
" prefix (e.g. 00:11:aa)\n\n" .
" genpasswords: Automatically generate random passwords for BMCs when configuring\n" .

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

@@ -4696,7 +4696,7 @@ sub parseboard {
my $macdata = $boardinf{extra}->[6]->{value};
my $macstring = "1";
my $macprefix;
while ($macdata and $macstring !~ /00:00:00:00:00:00/ and not ref $global_sessdata->{currmacs}) {
while ($macdata and ref $macdata and $macstring !~ /00:00:00:00:00:00/ and not ref $global_sessdata->{currmacs}) {
my @currmac = splice @$macdata, 0, 6;
unless ((scalar @currmac) == 6) {
last;