Изменен порядок запуска, изменены переменные действия.

В init.d/calculate добавлено условие запуска перед xdm.
Переменные ac_install_merge и ac_install_live могут быть включенными
при вызове перенастройки из шаблоно client (cl_action domain/undomain).

data/calculate

@@ -15,7 +15,7 @@
 
 depend() {
 	need localmount root fsck modules
-	before keymaps consolefont dbus
+	before keymaps consolefont dbus xdm
 	use swap hostname
 }
 

install/variables/action.py

@@ -33,7 +33,8 @@ class VariableAcInstallMerge(ActionVariable):
             self.Get('os_install_root_type') != 'flash' and \
             self.Get('os_install_pxe') == 'off' and \
             self.Get('cl_live') == 'off' or \
-            cl_action in ("sync",) and self.Get('cl_merge_pkg'):
+            cl_action in ("sync","domain","undomain") \
+                and self.Get('cl_merge_pkg'):
             return "on"
         return "off"
 
@@ -49,7 +50,8 @@ class VariableAcInstallLive(ActionVariable):
         if cl_action in ("system","merge") and \
             self.Get('os_install_root_type') != 'flash' and \
             self.Get('os_install_pxe') == 'off' or \
-            cl_action in ("sync",) and self.Get('cl_merge_pkg'):
+            cl_action in ("sync","domain","undomain") \
+                and self.Get('cl_merge_pkg'):
             return "on"
         return "off"