Убран вызов cl-setup-boot для builder

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',

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',),