Merge remote-tracking branch 'origin/master' into develop

install/variables/net.py

@@ -790,3 +790,24 @@ class VariableOsInstallNetSettings(NetHelper,Variable):
 
     def choice(self):
         return [("","")]+self.Get('os_install_net_conf_available')
+
+class VariableOsInstallPxeIp(Variable):
+    """
+    IP адрес PXE сервера
+    """
+    type = "choice"
+    opt = ["--ip"]
+    metavalue = "IP"
+
+    def init(self):
+        self.label = _("PXE server IP")
+        self.help = "set IP address for PXE server"
+
+    def get(self):
+        for ipaddr in ifilter(None, self.Get('os_install_net_ip')):
+            return ipaddr
+        else:
+            return ""
+
+    def choice(self):
+        return filter(None, self.Get('os_install_net_ip'))

install/wsdl_install.py

@@ -150,7 +150,8 @@ class Wsdl(WsdlBase):
         'groups':[
             lambda group:group(_("PXE install"),
                 normal=('cl_image_filename',),
-                expert=('os_install_pxe_path',),
+                expert=('os_install_pxe_path',
+                        'os_install_pxe_ip'),
                 next_label=_("Install"))]},
         # настройка аудио
         {