upstream/packer
1
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-06-11 09:40:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1989 from marcomorain/upper-case-mac-address

Browse source 
Fix for VMWare on OSX – MAC address can be upper or lower case
This commit is contained in:
Mitchell Hashimoto 2015-05-28 09:38:23 -07:00
commit 7bd618b56b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
builder/vmware/common/guest_ip.go
View file

@ -2,6 +2,7 @@ package common
import (
"errors"
"fmt"
"io/ioutil"
"log"
"os"
@ -75,14 +76,14 @@ func (f *DHCPLeaseGuestLookup) GuestIP() (string, error) {
// If the mac address matches and this lease ends farther in the
// future than the last match we might have, then choose it.
matches = macLineRe.FindStringSubmatch(line)
if matches != nil && matches[1] == f.MACAddress && curLeaseEnd.Before(lastLeaseEnd) {
if matches != nil && strings.EqualFold(matches[1], f.MACAddress) && curLeaseEnd.Before(lastLeaseEnd) {
curIp = lastIp
curLeaseEnd = lastLeaseEnd
}
}
if curIp == "" {
return "", errors.New("IP not found for MAC in DHCP leases")
return "", fmt.Errorf("IP not found for MAC %s in DHCP leases at %s", f.MACAddress, dhcpLeasesPath)
}
return curIp, nil