diff options
| author | Scott Moser <smoser@brickies.net> | 2017-05-26 15:53:48 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-05-26 15:53:48 -0400 |
| commit | cc9748215f612b8c600c1080c60af71fe7624c47 (patch) | |
| tree | 3f008cb6350adf6bc003d2d5ad2d851c9506b81e /cloudinit/net/__init__.py | |
| parent | 3dd56b4504003928bace87a7e67b08e9376fc6c1 (diff) | |
| parent | 16a7302f6acb69adb0aee75eaf12392fa3688853 (diff) | |
| download | vyos-cloud-init-cc9748215f612b8c600c1080c60af71fe7624c47.tar.gz vyos-cloud-init-cc9748215f612b8c600c1080c60af71fe7624c47.zip | |
merge from master at 0.7.9-153-g16a7302f
Diffstat (limited to 'cloudinit/net/__init__.py')
| -rw-r--r-- | cloudinit/net/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cloudinit/net/__init__.py b/cloudinit/net/__init__.py index a072a8d6..8c6cd057 100644 --- a/cloudinit/net/__init__.py +++ b/cloudinit/net/__init__.py @@ -393,6 +393,7 @@ def get_interfaces_by_mac(): else: raise ret = {} + empty_mac = '00:00:00:00:00:00' for name in devs: if not interface_has_own_mac(name): continue @@ -404,6 +405,8 @@ def get_interfaces_by_mac(): # some devices may not have a mac (tun0) if not mac: continue + if mac == empty_mac and name != 'lo': + continue if mac in ret: raise RuntimeError( "duplicate mac found! both '%s' and '%s' have mac '%s'" % |