|
|
@ -27,7 +27,7 @@ setLocalTranslate('cl_install3', sys.modules[__name__])
|
|
|
|
|
|
|
|
|
|
|
|
from calculate.lib.utils.ip import (getInterfaces, getIp, getMask, getMac,
|
|
|
|
from calculate.lib.utils.ip import (getInterfaces, getIp, getMask, getMac,
|
|
|
|
cidrToMask, maskToCidr, getIpNet, isDhcpIp,
|
|
|
|
cidrToMask, maskToCidr, getIpNet, isDhcpIp,
|
|
|
|
checkIp, checkMask,
|
|
|
|
checkIp, checkMask, isSlaveInterface,
|
|
|
|
getOperState, getPlugged)
|
|
|
|
getOperState, getPlugged)
|
|
|
|
from calculate.lib.utils.device import lspci
|
|
|
|
from calculate.lib.utils.device import lspci
|
|
|
|
from calculate.lib.utils.files import (listDirectory, readLinesFile)
|
|
|
|
from calculate.lib.utils.files import (listDirectory, readLinesFile)
|
|
|
@ -278,6 +278,8 @@ class VariableOsInstallNetStatus(NetHelper, Variable):
|
|
|
|
def statusValue(ipaddr, dhcp):
|
|
|
|
def statusValue(ipaddr, dhcp):
|
|
|
|
if not getPlugged(iface):
|
|
|
|
if not getPlugged(iface):
|
|
|
|
return 'off'
|
|
|
|
return 'off'
|
|
|
|
|
|
|
|
if isSlaveInterface(iface):
|
|
|
|
|
|
|
|
return 'off'
|
|
|
|
if dhcp == "on":
|
|
|
|
if dhcp == "on":
|
|
|
|
return "dhcp"
|
|
|
|
return "dhcp"
|
|
|
|
elif ipaddr:
|
|
|
|
elif ipaddr:
|
|
|
|