From 4428ae5cc171e52c6931a4b7e48a5df3cdfe19ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 9 Sep 2016 10:38:34 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D1=87?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B0=D0=B2=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=82=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/install/variables/disk.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pym/install/variables/disk.py b/pym/install/variables/disk.py index e5acd0a..ab09d1c 100644 --- a/pym/install/variables/disk.py +++ b/pym/install/variables/disk.py @@ -1879,8 +1879,7 @@ class VariableOsInstallMbr(LocationHelper, Variable): """Get default Master boot record install""" if self.Get('os_install_uefi_set') == 'on': return [] - if self.Get('cl_autopartition_set') == 'on' and \ - self.Get('cl_autopartition_lvm_set') == 'on': + if self.Get('cl_autopartition_set') == 'on': return self.Get('cl_autopartition_device') if self.Get('os_install_root_type') in ("flash", "usb-hdd"): rootdev = self.Get('os_install_root_dev') From a74dc0e99fdbe4137308d5e34fda7fae276a2595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Mon, 10 Oct 2016 17:54:18 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20bond=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/install/variables/net.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pym/install/variables/net.py b/pym/install/variables/net.py index a92d2a4..064ac5b 100644 --- a/pym/install/variables/net.py +++ b/pym/install/variables/net.py @@ -27,7 +27,7 @@ setLocalTranslate('cl_install3', sys.modules[__name__]) from calculate.lib.utils.ip import (getInterfaces, getIp, getMask, getMac, cidrToMask, maskToCidr, getIpNet, isDhcpIp, - checkIp, checkMask, + checkIp, checkMask, isSlaveInterface, getOperState, getPlugged) from calculate.lib.utils.device import lspci from calculate.lib.utils.files import (listDirectory, readLinesFile) @@ -278,6 +278,8 @@ class VariableOsInstallNetStatus(NetHelper, Variable): def statusValue(ipaddr, dhcp): if not getPlugged(iface): return 'off' + if isSlaveInterface(iface): + return 'off' if dhcp == "on": return "dhcp" elif ipaddr: