Merge branch 'master' of git.calculate.ru:/calculate-client

client/system/domain/etc/ldap.conf

@@ -15,3 +15,4 @@ nss_base_group  ou=Groups,#-server(unix.dn)-#?one
 #?server(samba.dn)!=#
 nss_base_group  ou=Groups,#-server(samba.dn)-#?one
 #server#
+

client/system/domain/etc/nsswitch.conf

@@ -19,3 +19,4 @@ bootparams:  files
 
 automount:   files ldap
 aliases:     files
+

client/system/undomain/etc/ldap.conf

@@ -1 +1,2 @@
 # Calculate format=ldap append=replace chmod=0644 chown=root:root
+

client/system/undomain/etc/nsswitch.conf

@@ -20,3 +20,4 @@ bootparams:  files
 
 automount:   files
 aliases:     files
+

data/client

@@ -26,16 +26,16 @@ start() {
 	# Mount remote Samba filesystems.
 	ebegin "Mounting domain resources"
 	# Identifing domain server by env file
-	local env_file=/var/calculate/calculate.env
+	local env_file=/var/calculate/calculate2.env
 	if [[ -f $env_file ]]
 	then 
-		local SERVER=$( sed -rn 's/^cl_remote_host\s*=\s*(\S+)$/\1/p' $env_file )
+		local SERVER=$( sed -rn 's/^cl_remote_host\s*=\s*(\S+)\s*$/\1/p' $env_file )
 		for COUNT in $( seq 0 20 )
 		do
 			ping -w2 -c1 $SERVER &>/dev/null && break || sleep 1
 		done
 	fi
-	cl-client --mount
+	cl-client-2.2 --mount
 	eend $? "Some samba remote resources to mount"
 }