Skip to content

Commit

Permalink
Allow IPoIB MAC addresses for provisioning via IPoIB
Browse files Browse the repository at this point in the history
Examples:

EFI Boot MAC address: 20:b8:ce:f6:03:00:31:33:3e
OS MAC address: b8:ce:f6:31:33:3e
  • Loading branch information
Obihoernchen committed Feb 12, 2024
1 parent 65b5c72 commit 172678a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions xCAT-server/lib/xcat/plugins/dhcp.pm
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ sub addnode
$hname = $node;
} #Default to hostname equal to nodename
unless ($mac) { next; } #Skip corrupt format
if ($mac !~ /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5,7}$|^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5,7}$/)
if ($mac !~ /^[0-9a-fA-F]{2}(-[0-9a-fA-F]{2}){5,8}$|^[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5,8}$/)
{
$callback->(
{
Expand Down Expand Up @@ -764,8 +764,8 @@ sub addnode
$hostname = $1 . "-hf" . $count;
}
}
} elsif (length($mac) == 23) { # 8 bytes of mac address
# Currently the only thing that has 8 bytes is an infiniband
} elsif (length($mac) == 23 || length($mac) == 26) { # 8 or 9 bytes of mac address
# Currently the only thing that has 8 or 9 bytes is an infiniband
# or infiniband like device, which is type 32 (0x20).
$hardwaretype = 32;
}
Expand Down

0 comments on commit 172678a

Please sign in to comment.