From 4142626e6e11f7c11280bb143851e1cc197cb60b Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Mon, 28 Oct 2013 14:46:01 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BD=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=20cl-setup-boot=20=D0=B4=D0=BB=D1=8F=20build?= =?UTF-8?q?er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/utils/cl_setup.py | 7 ++++++- install/wsdl_install.py | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/install/utils/cl_setup.py b/install/utils/cl_setup.py index 968680d..e4ad417 100644 --- a/install/utils/cl_setup.py +++ b/install/utils/cl_setup.py @@ -145,7 +145,12 @@ class ClSetupBootAction(ClSetupSystemAction): 'method':'Install.prepareBoot(cl_image)', 'condition':(lambda Get:(Get('os_install_mbr') or Get('os_install_uefi_set') == 'on') and - Get('os_root_type') != 'livecd') + Get('os_root_type') != 'livecd' and + Get('os_install_scratch') == 'off') + }, + {'name':'no_scratch', + 'warning':_("The builder mode is not longer supported"), + 'condition':lambda Get:Get('os_install_scratch') == 'on' }, # изменить IO планировщик {'name':'change_ioscheduler', diff --git a/install/wsdl_install.py b/install/wsdl_install.py index 61f6e1f..511e16c 100644 --- a/install/wsdl_install.py +++ b/install/wsdl_install.py @@ -69,9 +69,10 @@ class Wsdl(WsdlBase): 'cl_image_new_only')), lambda group:group(_("Allocate drive space"), normal=('cl_autopartition_set',), - expert=('cl_autopartition_scheme','cl_autopartition_device', + expert=('cl_autopartition_scheme', 'cl_autopartition_table','cl_autopartition_root_size', - 'cl_autopartition_swap_size'), + 'cl_autopartition_swap_size', + 'cl_autopartition_device'), expert_label=_("Click to set up autopartition options")), lambda group:group(_("Mount points"), normal=('os_location_data',),