Ubuntu Pastebin

Paste from root at Thu, 27 Apr 2017 16:21:59 +0000

Download as text 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
--- /usr/lib/python3/dist-packages/cloudinit/stages.py.dist	2017-04-27 16:15:07.090896544 +0000
+++ /usr/lib/python3/dist-packages/cloudinit/stages.py	2017-04-27 16:15:12.870700323 +0000
@@ -618,7 +618,8 @@
             dscfg = ('ds', self.datasource.network_config)
         sys_cfg = ('system_cfg', self.cfg.get('network'))
 
-        for loc, ncfg in (cmdline_cfg, sys_cfg, dscfg):
+        #for loc, ncfg in (cmdline_cfg, sys_cfg, dscfg):
+        for loc, ncfg in (sys_cfg, dscfg):
             if net.is_disabled_cfg(ncfg):
                 LOG.debug("network config disabled by %s", loc)
                 return (None, loc)
--- /usr/lib/python3/dist-packages/cloudinit/net/__init__.py.dist	2017-04-27 16:18:40.543646944 +0000
+++ /usr/lib/python3/dist-packages/cloudinit/net/__init__.py	2017-04-27 16:21:12.648474921 +0000
@@ -404,6 +404,9 @@
         # some devices may not have a mac (tun0)
         if not mac:
             continue
+        if mac.replace("0", "").replace(":", "") == "":
+            LOG.debug("%s has all-zero mac address: %s", name, mac)
+            continue
         if mac in ret:
             raise RuntimeError(
                 "duplicate mac found! both '%s' and '%s' have mac '%s'" %
Download as text