diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:41 -0400 |
| commit | 7b925df28f84c824e9e4697723d879903a81e780 (patch) | |
| tree | 2314e210f13cc5cc7bdc59971b9f4b657f755825 /cloudinit/net | |
| parent | d0c794919d9a9bf176eb96e25e72836a65e841f1 (diff) | |
| parent | a551cb080388c2016bcf23981f99a4a6aa0fe198 (diff) | |
| download | vyos-cloud-init-7b925df28f84c824e9e4697723d879903a81e780.tar.gz vyos-cloud-init-7b925df28f84c824e9e4697723d879903a81e780.zip | |
merge trunk at 0.7.7~bzr1208
Diffstat (limited to 'cloudinit/net')
| -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 40929c6e..31110292 100644 --- a/cloudinit/net/__init__.py +++ b/cloudinit/net/__init__.py @@ -646,6 +646,9 @@ def generate_fallback_config(): connected = [] possibly_connected = [] for interface in potential_interfaces: + if os.path.exists(sys_dev_path(interface, "bridge")): + # skip any bridges + continue try: carrier = int(sys_netdev_info(interface, 'carrier')) if carrier: |