Исправлены скрипты входа в сеанс для изменённого xdm login

data/login.d/10client

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2010-2015 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,21 +13,19 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-/usr/sbin/env-update
-source /etc/profile
-source /usr/share/calculate/xdm/functions
-
-if [ -e '/usr/sbin/cl-client-sync-login' ];
-then
-  if [[ "${DOMAIN_USER}" == "on" ]]
-  then
-      ERRORLOG=`/usr/sbin/cl-client-sync-login --gui-progress --gui-warning $USER 2>&1`
-      # log error
-      if [ "$?" -gt "0" ];
-      then
-        echo "$ERRORLOG" >> $FILE_LOG
-        exit 1
-      fi
-  fi
-fi
-exit 0
+run_script() {
+	if [ -e '/usr/sbin/cl-client-sync-login' ];
+	then
+		if [[ "${DOMAIN_USER}" == "on" ]]
+		then
+			ERRORLOG=`/usr/sbin/cl-client-sync-login --gui-progress --gui-warning $USER 2>&1`
+			# log error
+			if [ "$?" -gt "0" ];
+			then
+				echo "$ERRORLOG" >> $FILE_LOG
+				return 1
+			fi
+		fi
+	fi
+	return 0
+}

data/login.d/15resume_remount

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2013-2015 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,13 +13,10 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-/usr/sbin/env-update
-source /etc/profile
-source /usr/share/calculate/xdm/functions
-
-if [[ "${DOMAIN_USER}" == "on" ]]
-then
-  /usr/sbin/cl-client-resume-remount ${USER} &
-fi
-
-exit 0
+run_script() {
+	if [[ "${DOMAIN_USER}" == "on" ]]
+	then
+		/usr/sbin/cl-client-resume-remount ${USER} &
+	fi
+	return 0
+}

data/logout.d/10client

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright 2010 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2010-2015 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,21 +13,19 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-/usr/sbin/env-update
-source /etc/profile
-source /usr/share/calculate/xdm/functions
-
-if [ -e '/usr/sbin/cl-client-sync-logout' ];
-then
-  if [[ "${DOMAIN_USER}" == "on" ]]
-  then
-    ERRORLOG=`/usr/sbin/cl-client-sync-logout $USER 2>&1`
-    # log errors
-    if [ "$?" -gt "0" ];
-    then
-      echo "$ERRORLOG" >> $FILE_LOG
-      exit 1
-    fi
-  fi
-fi
-exit 0
+run_script() {
+	if [ -e '/usr/sbin/cl-client-sync-logout' ];
+	then
+		if [[ "${DOMAIN_USER}" == "on" ]]
+		then
+			ERRORLOG=`/usr/sbin/cl-client-sync-logout $USER 2>&1`
+			# log errors
+			if [ "$?" -gt "0" ];
+			then
+				echo "$ERRORLOG" >> $FILE_LOG
+				return 1
+			fi
+		fi
+	fi
+	return 0
+}

data/logout.d/15resume_remount

@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
+# Copyright 2013-2015 Calculate Ltd. http://www.calculate-linux.org
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -13,13 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-/usr/sbin/env-update
-source /etc/profile
-source /usr/share/calculate/xdm/functions
+run_script() {
+	if [[ "${DOMAIN_USER}" == "on" ]]
+	then
+		pkill -f "cl-client-resume-remount ${USER}"
+	fi
 
-if [[ "${DOMAIN_USER}" == "on" ]]
-then
-  pkill -f "cl-client-resume-remount ${USER}"
-fi
-
-exit 0
+	return 0
+}