From 51917f8ee0c85d0ad06999d774b306e64b45ed5d Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Mon, 7 Oct 2013 12:41:44 +0400 Subject: [PATCH] =?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=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=83=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20PXE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/variables/system.py | 5 +++-- install/wsdl_install.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/install/variables/system.py b/install/variables/system.py index 4fc82e3..0bcfb52 100644 --- a/install/variables/system.py +++ b/install/variables/system.py @@ -170,7 +170,7 @@ class VariableClInstallHomeCryptSet(UserHelper,Variable): untrusted = True def init(self): - self.help = _("Encrypt user profiles") + self.help = _("encrypt user profiles") self.label = _("Encrypt user profiles") def get(self): @@ -564,12 +564,13 @@ class VariableClLive(Variable): self.label = _("Configure dynamic options only") self.help = _("configure dynamic options only") -class VariableOsInstallPxe(ReadonlyVariable): +class VariableOsInstallPxe(Variable): """ Installation for PXE loading """ type = "boot" value = "off" + untrusted = True def check(self,value): if value == "on": diff --git a/install/wsdl_install.py b/install/wsdl_install.py index 66a9e54..7d0a51f 100644 --- a/install/wsdl_install.py +++ b/install/wsdl_install.py @@ -138,9 +138,13 @@ class Wsdl(WsdlBase): 'datavars':"install", 'native_error':(VariableError,DistributiveError, DataVarsError,install.InstallError), - 'setvars':{'cl_action!':'system','os_install_pxe!':'on', + 'setvars':{'cl_action!':'system','os_install_pxe':'on', 'cl_protect_use_set!':'off', 'cl_dispatch_conf':'usenew'}, + # действие выводит информацию перед запуском + 'brief':{'next':__("Installation"), + 'image':'finish', + 'name':__("Start installing")}, 'groups':[ lambda group:group(_("PXE install"), normal=('cl_image_filename',),