[X2Go-Commits] [live-build-x2go] 47/108: Private keys did not get deleted by MMD but by windows portable mode - must not be placed in x2goclient/ssh, or else they will be gone once x2goclient.exe exits. instead, use x2goclient/.ssh, or x2goclient/sshkeys - as .dotfiles and .dotfolders cannot be created in Windows Explorer, only on commandline.

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

    Private keys did not get deleted by MMD but by windows portable mode - must not be placed in x2goclient/ssh, or else they will be gone once x2goclient.exe exits. instead, use x2goclient/.ssh, or x2goclient/sshkeys - as .dotfiles and .dotfolders cannot be created in Windows Explorer, only on commandline.
---
 .../includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index bf6e34b..9802706 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -16,8 +16,8 @@ GetSSHClientKeysFromMedia ()
 			# It also allows you to use USB media with your key on it together with a net-booted Debian Live, for example.
 
 			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
+				if [ -d $1/config/ssh ] || [ -d $1/ssh ] || [ -d $1/x2goclient/.ssh ] || [ -d $1/x2goclient/sshkeys ] || [ -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 ! [ -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
@@ -34,7 +34,7 @@ GetSSHClientKeysFromMedia ()
 					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
+					for KEYFILE in $1/config/ssh/* $1/ssh/* $1/x2goclient/.ssh/* $1/x2goclient/sshkeys/* $1/.ssh/* ; do
 						([ -f "$KEYFILE" ] && [ -s "$KEYFILE" ]) || continue
 						egrep -q "BEGIN .*(PRIVATE|PUBLIC) KEY" "$KEYFILE" || continue
 						echo -n "\n$(date +'%F | %T | ')'$0' Keyfile '$KEYFILE' found, copying and adjusting ownership and permissions on destination." | tee -a /dev/tty8

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