Merge branch 'lower-virtual-nics' into develop

This commit is contained in:
ZyX 2014-09-22 07:44:59 +04:00
commit 0ecb6136ad

View File

@ -72,13 +72,16 @@ except ImportError:
return None
else:
_interface_starts = {
'eth': 10, # Regular ethernet adapters : eth1
'enp': 10, # Regular ethernet adapters, Gentoo : enp2s0
'ath': 9, # Atheros WiFi adapters : ath0
'wlan': 9, # Other WiFi adapters : wlan1
'wlp': 9, # Other WiFi adapters, Gentoo : wlp5s0
'teredo': 1, # miredo interface : teredo
'lo': -10, # Loopback interface : lo
'eth': 10, # Regular ethernet adapters : eth1
'enp': 10, # Regular ethernet adapters, Gentoo : enp2s0
'ath': 9, # Atheros WiFi adapters : ath0
'wlan': 9, # Other WiFi adapters : wlan1
'wlp': 9, # Other WiFi adapters, Gentoo : wlp5s0
'teredo': 1, # miredo interface : teredo
'lo': -10, # Loopback interface : lo
'docker': -5, # Docker bridge interface : docker0
'vmnet': -5, # VMWare bridge interface : vmnet1
'vboxnet': -5, # VirtualBox bridge interface : vboxnet0
}
_interface_start_re = re.compile(r'^([a-z]+?)(\d|$)')