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 5c146fe4ad0a4b0bf090e2b5abe2006d19c9aaa7 Author: Stefan Baur (BAUR-ITCS) <kontakt@baur-itcs.de> Date: Sun Feb 18 18:09:45 2018 +0100 for portableapp/tce-hdd dualmode stick, private keys need to go into x2goclient/ssh --- .../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 72639e8..b0cad9b 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/.ssh ]; then - echo -n "\n$(date +'%F | %T | ')'$0' Keyfile directory found at '$1/config/ssh', '$1/ssh', or '$1/.ssh'." | tee -a /dev/tty8 + 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") @@ -28,7 +28,7 @@ GetSSHClientKeysFromMedia () # any keyfile in the config dir will be copied over to live system # - for KEYFILE in $1/config/ssh/* $1/ssh/* $1/.ssh/* ; do + for KEYFILE in $1/config/ssh/* $1/ssh/* $1/x2goclient/ssh/* $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