[X2Go-Commits] [live-build-x2go] 02/108: fixed permissions for ~/.ssh, fixed description for portableapps partition
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 20 22:12:58 CET 2019
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 d2a4a1f2a6f7e062553c96026d88fe655b6005d9
Author: Stefan Baur (BAUR-ITCS) <kontakt at baur-itcs.de>
Date: Sat Feb 3 14:28:12 2018 +0100
fixed permissions for ~/.ssh, fixed description for portableapps partition
---
.../lib/live/config/2270-getsshclientkeysfrommedia | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
index 2a7fc00..91f8171 100755
--- a/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
+++ b/config/includes.chroot/lib/live/config/2270-getsshclientkeysfrommedia
@@ -40,7 +40,7 @@ GetSSHClientKeysFromMedia ()
# search for our magic label
X2GOTCELIVELABELS=$(awk '$3~/^[^\/]/ && $3="" ; $1=="X2GO-TCE-LIVE" { print $2 " " $3}' /var/lib/live/config/opensshkeys)
- # support for legacy label value
+ # support for second label value (for dual-mode media where keys are stored on the windows-readable partition)
PORTABLEAPPLABELS=$(awk '$3~/^[^\/]/ && $3="" ; $1=="PORTABLEAPP" { print $2 " " $3}' /var/lib/live/config/opensshkeys)
# block device list, removable first (we want USB media to be able to override keys on fixed disks)
@@ -55,7 +55,11 @@ GetSSHClientKeysFromMedia ()
echo -n "\n$(date +'%F | %T | ')'$0' Keyfile directory found at '$1/config/ssh', '$1/ssh', or '$1/./ssh'." | tee -a /dev/tty8
# create .ssh-Directory in case it doesn't exist
#
- mkdir -p $(readlink -m "$USERHOME/.ssh/")
+ mkdir -p $(readlink -m "$USERHOME/.ssh")
+ chown $TARGETUSERNAME: \
+ $(readlink -m "$USERHOME/.ssh")
+ chmod 700 $KEYDESTPATH
+ $(readlink -m "$USERHOME/.ssh")
# any keyfile in the config dir will be copied over to live system
#
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/live-build-x2go.git
More information about the x2go-commits
mailing list