|
|
@ -107,11 +107,18 @@ class VariableOsInstallNetInterfacesOrig(NetHelper,ReadonlyVariable):
|
|
|
|
return self.Get('os_install_net_interfaces')
|
|
|
|
return self.Get('os_install_net_interfaces')
|
|
|
|
def getOrig(x):
|
|
|
|
def getOrig(x):
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
nameParam = filter(lambda x:x.startswith("ID_NET_NAME_PATH="),
|
|
|
|
nameParam = \
|
|
|
|
process("udevadm","test-builtin","net_id",
|
|
|
|
map(lambda x:x.partition('=')[::2],
|
|
|
|
"/sys/class/net/%s"%x))
|
|
|
|
filter(lambda x:x.startswith("ID_NET_NAME_PATH=") or
|
|
|
|
|
|
|
|
x.startswith("ID_NET_NAME_ONBOARD="),
|
|
|
|
|
|
|
|
process("udevadm","test-builtin","net_id",
|
|
|
|
|
|
|
|
"/sys/class/net/%s"%x)))
|
|
|
|
if nameParam:
|
|
|
|
if nameParam:
|
|
|
|
return nameParam[0].partition('=')[2].strip() or x
|
|
|
|
sortOrder = {'ID_NET_NAME_PATH':0,
|
|
|
|
|
|
|
|
'ID_NET_NAME_ONBOARD':1}
|
|
|
|
|
|
|
|
nameParam = sorted(nameParam,
|
|
|
|
|
|
|
|
key=lambda x:sortOrder.get(x[0],-1))
|
|
|
|
|
|
|
|
return nameParam[-1][1].strip() or x
|
|
|
|
except Exception as e:
|
|
|
|
except Exception as e:
|
|
|
|
print str(e)
|
|
|
|
print str(e)
|
|
|
|
return x
|
|
|
|
return x
|
|
|
|