Исправлено подключение пользовательских удаленных ресурсов после suspend.atratsevskiy
parent
28f43fd178
commit
b8368021f3
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="3"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
PYTHON_DEPEND="2:2.7"
|
||||
RESTRICT_PYTHON_ABIS="2.4 2.5 2.6 3.*"
|
||||
|
||||
inherit distutils eutils
|
||||
|
||||
SRC_URI="ftp://ftp.calculate.ru/pub/calculate/calculate3/${PN}/${P}.tar.bz2"
|
||||
|
||||
DESCRIPTION="The program of setting and storing the user account in the domain"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
|
||||
DEPEND="~sys-apps/calculate-desktop-3.1.9
|
||||
!<sys-apps/calculate-client-3.1.0
|
||||
>=dev-python/python-ldap-2.0[ssl]
|
||||
>=sys-auth/pam_ldap-180[ssl]
|
||||
>=sys-auth/nss_ldap-239
|
||||
>=sys-apps/keyexec-0.1.2
|
||||
dev-qt/qtdbus
|
||||
sys-apps/keyutils
|
||||
sys-auth/pam_keystore
|
||||
sys-auth/pam_client
|
||||
dev-lang/swig"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_unpack() {
|
||||
unpack "${A}"
|
||||
cd "${S}"
|
||||
|
||||
# apply revision changes
|
||||
epatch "${FILESDIR}/calculate-client-3.1.9-r3.patch"
|
||||
}
|
||||
@ -0,0 +1,112 @@
|
||||
diff --git data/cl-client-resume-remount data/cl-client-resume-remount
|
||||
index 68cdadc..0efe516 100644
|
||||
--- data/cl-client-resume-remount
|
||||
+++ data/cl-client-resume-remount
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env python
|
||||
#-*- coding: utf-8 -*-
|
||||
|
||||
-# Copyright 2013 Calculate Ltd. http://www.calculate-linux.org
|
||||
+# Copyright 2013-2014 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.
|
||||
@@ -89,8 +89,11 @@ class ResourceRemounter:
|
||||
print("Restoring remote mounts for user %s"%self.dv.Get('ur_login'))
|
||||
# waiting for the domain
|
||||
for wait in [1,2,5,10]:
|
||||
- if self.check_server(True):
|
||||
- break
|
||||
+ try:
|
||||
+ if self.check_server(True):
|
||||
+ break
|
||||
+ except:
|
||||
+ pass
|
||||
sleep(wait)
|
||||
# check and remount remote resources
|
||||
self.remount_remote()
|
||||
diff --git data/client data/client
|
||||
index 64da473..e3285f2 100644
|
||||
--- data/client
|
||||
+++ data/client
|
||||
@@ -43,14 +43,14 @@ start() {
|
||||
local NET_CONF=`cl-core-variables-show --only-value install.os_install_net_conf`
|
||||
if [[ $NET_CONF = "networkmanager" ]]
|
||||
then
|
||||
- for COUNT in $( seq 0 24 )
|
||||
+ for COUNT in $( seq 0 24 )
|
||||
do
|
||||
- NET_STATE=`qdbus --system org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.state`
|
||||
+ NET_STATE=`qdbus --system org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager.state`
|
||||
if [[ $NET_STATE = 40 ]]
|
||||
then
|
||||
- ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5
|
||||
+ ping -w4 -i0.5 -c3 $SERVERLIVE &>/dev/null && break || sleep 0.5
|
||||
else
|
||||
- break
|
||||
+ break
|
||||
fi
|
||||
done
|
||||
else
|
||||
@@ -61,7 +61,8 @@ start() {
|
||||
fi
|
||||
if [[ -z $SERVER ]]
|
||||
then
|
||||
- cl-client $SERVERLIVE && cl-setup-system -l remote &>/dev/null
|
||||
+ cl-client -T overlay,local $SERVERLIVE && res=$? &&
|
||||
+ cl-setup-system -T remote &>/dev/null
|
||||
else
|
||||
cl-client --mount
|
||||
fi
|
||||
diff --git data/login.d/10client data/login.d/10client
|
||||
index c1158e9..c90af42 100644
|
||||
--- data/login.d/10client
|
||||
+++ data/login.d/10client
|
||||
@@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-env-update
|
||||
+/usr/sbin/env-update
|
||||
source /etc/profile
|
||||
source /usr/share/calculate/xdm/functions
|
||||
|
||||
diff --git data/login.d/15resume_remount data/login.d/15resume_remount
|
||||
index ff93653..a991817 100644
|
||||
--- data/login.d/15resume_remount
|
||||
+++ data/login.d/15resume_remount
|
||||
@@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-env-update
|
||||
+/usr/sbin/env-update
|
||||
source /etc/profile
|
||||
source /usr/share/calculate/xdm/functions
|
||||
|
||||
diff --git data/logout.d/10client data/logout.d/10client
|
||||
index 37cf2ec..9737480 100644
|
||||
--- data/logout.d/10client
|
||||
+++ data/logout.d/10client
|
||||
@@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-env-update
|
||||
+/usr/sbin/env-update
|
||||
source /etc/profile
|
||||
source /usr/share/calculate/xdm/functions
|
||||
|
||||
diff --git data/logout.d/15resume_remount data/logout.d/15resume_remount
|
||||
index 802a28b..b49adb6 100644
|
||||
--- data/logout.d/15resume_remount
|
||||
+++ data/logout.d/15resume_remount
|
||||
@@ -13,7 +13,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-env-update
|
||||
+/usr/sbin/env-update
|
||||
source /etc/profile
|
||||
source /usr/share/calculate/xdm/functions
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI=4
|
||||
|
||||
DESCRIPTION="Calculate Utilities meta package"
|
||||
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
|
||||
SRC_URI=""
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="3"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="cl_consolegui cl_client cl_desktop cl_console"
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
=sys-apps/calculate-install-3.1.9-r5
|
||||
=sys-apps/calculate-i18n-3.1.9
|
||||
=sys-apps/calculate-lib-3.1.9-r12
|
||||
=sys-apps/calculate-core-3.1.9-r4
|
||||
=sys-apps/calculate-update-3.1.9
|
||||
cl_client? ( =sys-apps/calculate-client-3.1.9-r3 )
|
||||
cl_desktop? ( =sys-apps/calculate-desktop-3.1.9-r4 )
|
||||
cl_consolegui? ( =sys-apps/calculate-console-gui-3.1.9-r1 )
|
||||
cl_console? ( =sys-apps/calculate-console-3.1.9-r1 )
|
||||
"
|
||||
Loading…
Reference in new issue