[X2Go-Commits] [live-build-x2go] 45/108: attempting to fix race condition between 2270 and the minidesktop init scripts

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/openbox
in repository live-build-x2go.

commit ca0877da319559174bec0f7eeaf8d1300c357927
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Sun Feb 18 22:28:24 2018 +0100

    attempting to fix race condition between 2270 and the minidesktop init scripts
---
 .../lib/live/config/2270-getsshclientkeysfrommedia | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index b0cad9b..2db020b 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -18,14 +18,20 @@ GetSSHClientKeysFromMedia ()
 			check_for_config (){
 				if [ -d $1/config/ssh ] || [ -d $1/ssh ] || [ -d $1/x2goclient/ssh ] || [ -d $1/.ssh ]; then
 					echo -n "\n$(date +'%F | %T | ')'$0' Keyfile directory found at '$1/config/ssh', '$1/ssh', '$1/x2goclient/ssh', or '$1/.ssh'." | tee -a /dev/tty8
-					# create .ssh-Directory in case it doesn't exist
-					#
-					mkdir -p $(readlink -m "$USERHOME/.ssh")
-					chown   $TARGETUSERNAME: \
-						$(readlink -m "$USERHOME/.ssh")
-					chmod   700 \
-						$(readlink -m "$USERHOME/.ssh")
-
+					if [ "$TARGETUSERNAME" = "x2gothinclient" ] ; then
+						while ! [ -d $USERHOME/.ssh ] ; do
+							echo -n "\n$(date +'%F | %T | ')'$0' Waiting until minidesktop-init created '~/.ssh' ." | tee -a /dev/tty8
+							sleep 1
+						done
+					else
+						# create .ssh-Directory in case it doesn't exist
+						#
+						mkdir -p $(readlink -m "$USERHOME/.ssh")
+						chown   $TARGETUSERNAME: \
+							$(readlink -m "$USERHOME/.ssh")
+						chmod   700 \
+							$(readlink -m "$USERHOME/.ssh")
+					fi
 					# any keyfile in the config dir will be copied over to live system
 					#
 					for KEYFILE in $1/config/ssh/* $1/ssh/* $1/x2goclient/ssh/* $1/.ssh/* ; do

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git