Merge remote-tracking branch 'origin/master3.4'

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 \
+        if self.Get('cl_autopartition_set') == 'on':
-                        self.Get('cl_autopartition_lvm_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')

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: