From ae13a44ba59b9dd5f63d1ff88bca1260910b6eca Mon Sep 17 00:00:00 2001 From: Mike Hiretsky Date: Fri, 8 Feb 2013 10:41:18 +0400 Subject: [PATCH] Update detect off interfaces --- install/variables/net.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/install/variables/net.py b/install/variables/net.py index 297d736..438745d 100644 --- a/install/variables/net.py +++ b/install/variables/net.py @@ -25,7 +25,8 @@ from calculate.lib.cl_lang import setLocalTranslate setLocalTranslate('cl_install3',sys.modules[__name__]) from calculate.lib.utils.ip import (getInterfaces,getIp,getMask,getMac, - cidrToMask,maskToCidr,getIpNet,isDhcpIp,checkIp,checkMask) + cidrToMask,maskToCidr,getIpNet,isDhcpIp,checkIp,checkMask, + getOperState) from calculate.lib.utils.device import lspci from calculate.lib.utils.files import listDirectory,readLinesFile,process from calculate.lib.utils import ip @@ -259,7 +260,10 @@ class VariableOsInstallNetStatus(NetHelper,Variable): elif ipaddr: return ipaddr else: - return "off" + if getOperState(iface) == 'down': + return "off" + else: + "dhcp" rootDevNfs = self.Get('os_root_dev') == '/dev/nfs' return statusValue(getIp(iface),"on" \ if rootDevNfs or isDhcpIp(iface) else "off")