diff --git a/data/client b/data/client index 83cbd99..52e0e1f 100644 --- a/data/client +++ b/data/client @@ -45,7 +45,7 @@ start() { local NET_CONF=`variable_value install.os_install_net_conf` if [[ $NET_CONF = "networkmanager" ]] && type qdbus &>/dev/null then - for COUNT in $( seq 0 40 ) + for COUNT in $( seq 0 32 ) do # https://developer.gnome.org/NetworkManager/stable/nm-dbus-types.html NET_STATE=`qdbus --system org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.state` @@ -53,7 +53,7 @@ start() { then ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5 else - [[ $NET_STATE = 20 && $COUNT -lt 20 ]] && sleep 0.5 || break + [[ $NET_STATE = 20 && $COUNT -lt 16 ]] && sleep 0.5 || break fi done else diff --git a/pym/client/utils/cl_client_sync.py b/pym/client/utils/cl_client_sync.py index 3078c58..044fdbd 100644 --- a/pym/client/utils/cl_client_sync.py +++ b/pym/client/utils/cl_client_sync.py @@ -322,14 +322,14 @@ class ClClientSyncLoginAction(Action): {'name': 'domain_sync:umount_unix', 'method': 'Client.umountRemoteUserRes(True,"unix","remote_profile")', 'depend': Tasks.hasnot('failed'), - 'condition': lambda GetBool: not Get('cl_client_ignore_errors_set') + 'condition': lambda GetBool: not GetBool('cl_client_ignore_errors_set') }, # отключить ресурсы в случае ошибки {'name': 'umount_remote_res', 'message': __("Umounting user resources"), 'method': 'Client.umountUserRes(desktop.ur_mount_dirs)', 'depend': Tasks.has('failed'), - 'condition': lambda GetBool: not Get('cl_client_ignore_errors_set') + 'condition': lambda GetBool: not GetBool('cl_client_ignore_errors_set') } ]