x/deb-os-net-config
Code Issues Proposed changes

Merge "launchpad bug 1537330, fix _is_active_nic"

Browse Source
This commit is contained in:
Jenkins 2016-03-02 21:08:49 +00:00 committed by Gerrit Code Review
commit c545e46f8f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os_net_config/utils.py
View File

@ -55,10 +55,8 @@ def _is_active_nic(interface_name):
if interface_name == 'lo': if interface_name == 'lo':
return False return False
addr_assign_type = None device_dir = _SYS_CLASS_NET + '/%s/device' % interface_name
with open(_SYS_CLASS_NET + '/%s/addr_assign_type' % interface_name, has_device_dir = os.path.isdir(device_dir)
'r') as f:
addr_assign_type = int(f.read().rstrip())
carrier = None carrier = None
with open(_SYS_CLASS_NET + '/%s/carrier' % interface_name, 'r') as f: with open(_SYS_CLASS_NET + '/%s/carrier' % interface_name, 'r') as f:
@ -68,7 +66,7 @@ def _is_active_nic(interface_name):
with open(_SYS_CLASS_NET + '/%s/address' % interface_name, 'r') as f: with open(_SYS_CLASS_NET + '/%s/address' % interface_name, 'r') as f:
address = f.read().rstrip() address = f.read().rstrip()
if addr_assign_type == 0 and carrier == 1 and address: if has_device_dir and carrier == 1 and address:
return True return True
else: else:
return False return False