git-svn-id: http://svn.calculate.ru/calculate2/calculate-client/trunk@1458 c91db197-33c1-4113-bf15-f8a5c547ca64

profile/CLDX/single/.xscreensaver

@@ -1,4 +1,3 @@
-#-title-#
 lockTimeout:	0:10:00
 mode:		one
 selected:	158

profile/install/client/etc/slim.conf

@@ -1,5 +1,12 @@
 # Calculate format=proftpd load(/etc/slim.conf)!=
 
-login_cmd               /usr/share/calculate/xdm/cmd_login && exec /bin/bash -login /etc/X11/xinit/xinitrc
+#?cl_pass_step==install#
+login_cmd               if ! /usr/share/calculate/xdm/cmd_login ; then exit 1; fi && exec /bin/bash -login /etc/X11/xinit/xinitrc
 sessionstart_cmd	export USER=%user && /usr/share/calculate/xdm/login && /usr/bin/sessreg -a -l :0.0 %user
 sessionstop_cmd         export USER=%user && /usr/share/calculate/xdm/logout && /usr/bin/sessreg -d -l :0.0 %user
+#cl_pass_step#
+#?cl_pass_step==uninstall#
+login_cmd               exec /bin/bash -login /etc/X11/xinit/xinitrc
+sessionstart_cmd	/usr/bin/sessreg -a -l :0.0 %user
+sessionstop_cmd         /usr/bin/sessreg -d -l :0.0 %user
+#cl_pass_step#

profile/install/client/usr/share/config/kdm/kdmrc

@@ -1,5 +1,11 @@
 # Calculate format=kde load(/usr/share/config/kdm/kdmrc)!=
-
+#?cl_pass_step==install#
 [X-*-Core]
 Reset=/usr/share/calculate/xdm/logout
 Startup=/usr/share/calculate/xdm/login
+#cl_pass_step#
+#?cl_pass_step==uninstall#
+[X-*-Core]
+Reset=/usr/share/config/kdm/Xreset
+Startup=/usr/share/config/kdm/Xstartup
+#cl_pass_step#

pym/cl_client.py

@@ -984,12 +984,26 @@ conjunction with the 'login' or 'logout'")
                 profpath.append(profPath)
         return profpath
 
-    def applyProfilesClient(self, clVars=False, printSuccess=True):
-        """Наложение профиля клиента"""
+    def applyProfilesClient(self, clVars=False, printSuccess=True,
+                            addDomain=True):
+        """Наложение профиля клиента и при необходимости подключение к домену"""
+        if not self.isRoot():
+            return False
         if not clVars:
             #Создаем объект переменных
             self.createClVars()
             clVars = self.clVars
+        messageOk = _("Added use of scripts this package for window \
+manager") + " ..."
+        # Устанавливаем переменную профиля
+        clVars.Set("cl_pass_step","install",True)
+        remoteHost = clVars.Get("cl_remote_host")
+        if addDomain and remoteHost:
+            if not self.addDomain(remoteHost):
+                return False
+            if printSuccess:
+                self.printOK(messageOk)
+            return True
          # Изменяем базовую директорию наложения профилей
         clVars.Set("cl_root_path","/",True)
         # Новые пути к профилям
@@ -1004,8 +1018,7 @@ conjunction with the 'login' or 'logout'")
             self.printERROR(_("Not apply 'install/client' profiles"))
             return False
         if printSuccess:
-            self.printOK(_("Added use of scripts this package for window \
-manager") + " ...")
+            self.printOK(messageOk)
         return True
 
 
@@ -1110,7 +1123,7 @@ manager") + " ...")
 or ld_bind_dn or ld_bind_pw")
             return False
         # Наложим профили install/client
-        if not self.applyProfilesClient(self.clVars, False):
+        if not self.applyProfilesClient(self.clVars, False, False):
             return False
         # Наложим профили install/domain
         # Новые пути к профилям