The branch, build-main has been updated via cacfdec77e11e87ee1d8b1fcff16d9014b84e582 (commit) from 0fee6764224d9ac31cfc0e14186eec78dc5a6252 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/control | 2 +- .../sbin/x2gothinclient_create | 3 ++ .../sbin/x2gothinclient_update | 4 +++ .../share/etc/x2gothinclient_init | 1 + .../share/etc/x2gothinclient_sessions | 30 ++++++++++++++++++++ 6 files changed, 40 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 700bb82..4dd824e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - Make the SSH daemon listen on IPv4 localhost address only. - Provide /dev/pts inside chroot. - Move configuration template from /usr/share/tce to /usr/share/tce/etc. + - Add direct FreeRDP support for defaults TCE installation. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/debian/control b/debian/control index c87e6fc..f170d4c 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Architecture: all Depends: ${misc:Depends}, psmisc, - x2goclient (>= 3.99.1.1-0~), + x2goclient (>= 3.99.3.0-0~), xauth, xinit, locales, diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 0fa4b8e..b8f0c7e 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -68,6 +68,9 @@ test -f $TC_CONFIG/x2gothinclient_start || cp $SHAREDIR/etc/x2gothinclient_start test -f $TC_CONFIG/x2gothinclient_sessions || cp $SHAREDIR/etc/x2gothinclient_sessions $TC_CONFIG test -f $TC_CONFIG/x2goclient-background.svg || cp $SHAREDIR/etc/x2goclient-background.svg $TC_CONFIG +mkdir -p $TC_CONFIG/freerdp +test -f $TC_CONFIG/freerdp/known_hosts || echo "# X2Go TCE: validate allowed RDP servers with their fingerprints through this file" > $TC_CONFIG/known_hosts + apt-get install debootstrap mkdir -p $TC_CHROOT diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update index 24f2d8b..91675fe 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -79,5 +79,9 @@ if test -f $TC_CONFIG/x2goclient-background.svg; then chmod a+rx $TC_CHROOT/etc/x2go/x2goclient-background.svg fi +if test -f $TC_CONFIG/freerdp/known_hosts; then + cp -v "$TC_CONFIG/freerdp/known_hosts" "$TC_CHROOT/etc/x2go/freerdp/known_hosts" +fi + echo diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init index 60a1b23..5b65a98 100755 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_init +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init @@ -23,6 +23,7 @@ mkdir -p /home/x2goclient mkdir -p /home/x2goclient/.x2goclient test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions /home/x2goclient/.x2goclient/sessions +test -e /etc/x2go/freerdp/known_hosts && mkdir /home/x2goclient/.freerdp && cp /etc/x2go/freerdp/known_hosts /home/x2goclient/.freerdp/known_hosts mkdir -p /home/x2goclient/.kde mkdir -p /home/x2goclient/.kde/socket-`cat /etc/hostname` mkdir -p /home/x2goclient/export diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_sessions b/x2gothinclientmanagement/share/etc/x2gothinclient_sessions index 509bc9d..b259c7d 100644 --- a/x2gothinclientmanagement/share/etc/x2gothinclient_sessions +++ b/x2gothinclientmanagement/share/etc/x2gothinclient_sessions @@ -36,3 +36,33 @@ dpi = 96 sshport = 22 setdpi = false pack = 16m-jpeg + +[20120607130604224872] +height = 768 +export = +fullscreen = true +layout = us +useexports = 1 +width = 1024 +speed = 4 +rdpoptions = +soundsystem = pulse +print = true +type = pc105/us +sndport = 4713 +usekbd = true +host = rdpserver.your-intranet.local +multidisp=false +sound=false +rootless=false +name=DirectRDP.Example +command=RDP +dpi=96 +published=false +setdpi=false +user=<USER> +maxdim=false +rdpclient=xfreerdp +directrdpsettings=-d YOUR-DOMAIN --plugin rdpsnd --plugin rdpdr --data disk:media:/media -- +rdpport=3389 +directrdp=true hooks/post-receive -- x2gothinclient.git (X2Go Thin Client Environment) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "x2gothinclient.git" (X2Go Thin Client Environment).