[X2Go-Commits] [x2gothinclient] 02/03: management/sbin/x2gothinclient_update: Consider known_hosts2 FreeRDP host key files, known_hosts was used for FreeRDP v1.x and are in fact deprecated nowadays.

git-admin at x2go.org git-admin at x2go.org
Fri Nov 23 21:41:31 CET 2018


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

x2go pushed a commit to branch master
in repository x2gothinclient.

commit cd1992b6f719dc9c30c9487560592a4cd9cd5396
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 23 21:37:24 2018 +0100

    management/sbin/x2gothinclient_update: Consider known_hosts2 FreeRDP host key files, known_hosts was used for FreeRDP v1.x and are in fact deprecated nowadays.
---
 debian/changelog                      | 3 +++
 management/sbin/x2gothinclient_update | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd1119d..32927f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,9 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
       (Fixes: #719).
     - management/sbin/x2gothinclient_update: Create
       $TC_CHROOT/etc/x2go/x2gothinclient_init.d/ before copying files into it.
+    - management/sbin/x2gothinclient_update: Consider known_hosts2 FreeRDP host
+      key files, known_hosts was used for FreeRDP v1.x and are in fact
+      deprecated nowadays.
   * debian/control:
     + Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
     + Make sure x2gothinclient-minidesktop pulls in X11 and X2Go Client.
diff --git a/management/sbin/x2gothinclient_update b/management/sbin/x2gothinclient_update
index 64a1626..bf2637e 100755
--- a/management/sbin/x2gothinclient_update
+++ b/management/sbin/x2gothinclient_update
@@ -86,9 +86,9 @@ if test -f "$TC_CONFIG/x2gothinclient-${TC_FLAVOUR}_background.svg"; then
 	ln -sf "/etc/x2go/x2gothinclient-${TC_FLAVOUR}_background.svg" "$TC_CHROOT/etc/x2go/x2gothinclient-background.svg"
 fi
 
-if test -f "$TC_CONFIG/freerdp/known_hosts"; then
+if test -f "$TC_CONFIG/freerdp/known_hosts" || test -f "$TC_CONFIG/freerdp/known_hosts2" ; then
 	mkdir -p "$TC_CHROOT/etc/x2go/freerdp/"
-	cp -v "$TC_CONFIG/freerdp/known_hosts" "$TC_CHROOT/etc/x2go/freerdp/known_hosts"
+	cp -v "$TC_CONFIG/freerdp/known_hosts*" "$TC_CHROOT/etc/x2go/freerdp/"
 fi
 
 echo

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


More information about the x2go-commits mailing list