[X2Go-Commits] [live-build-x2go] 46/108: another attempt at fixing the private-keys-get-deleted-in-MMD-mode issue

[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 d78d1918c18b24710d8bbea8310af20fbf734279
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date:   Mon Feb 19 11:28:12 2018 +0100

    another attempt at fixing the private-keys-get-deleted-in-MMD-mode issue
---
 config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 2db020b..bf6e34b 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -19,8 +19,8 @@ GetSSHClientKeysFromMedia ()
 				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
 					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
+						while ! [ -f $USERHOME/.x2goclient/settings ] ; do
+							echo -n "\n$(date +'%F | %T | ')'$0' Waiting until minidesktop-init script has finished before we populate '~/.ssh' ." | tee -a /dev/tty8
 							sleep 1
 						done
 					else

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