From 66c429ae2498a754b170def16f1154fe2b718ca0 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Thu, 24 Apr 2014 09:42:48 +0400 Subject: [PATCH] =?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=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D1=83=D0=BA=D0=B0=D0=B7?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F=20IP=20PXE=20=D1=81=D0=B5=D1=80=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/variables/net.py | 21 +++++++++++++++++++++ install/wsdl_install.py | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/install/variables/net.py b/install/variables/net.py index e9e400d..01b0032 100644 --- a/install/variables/net.py +++ b/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')) diff --git a/install/wsdl_install.py b/install/wsdl_install.py index 511e16c..f47e342 100644 --- a/install/wsdl_install.py +++ b/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"))]}, # настройка аудио {