[X2go-Commits] x2gothinclient.git - master (branch) updated:

X2Go dev team git-admin at x2go.org
Fri Oct 26 00:55:03 CEST 2012

The branch, master has been updated
       via  598c9aee2faa7f60d81c2318ce917239d41f31c4 (commit)
      from  6299cadccb404c305e0cff80e7b95e47acd5c859 (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 -----------------------------------------------------------------
commit 598c9aee2faa7f60d81c2318ce917239d41f31c4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Oct 26 00:55:04 2012 +0200

    make x2gothinclient_init more robust


Summary of changes:
 x2gothinclientmanagement/sbin/x2gothinclient_shell |    4 ++++
 .../share/etc/x2gothinclient_init                  |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 79c4dc3..fc70488 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -96,9 +96,13 @@ mkdir -p $TC_CHROOT/{proc,dev/pts,sys}
 mount | grep $TC_CHROOT/proc >/dev/null || mount -tproc proc $TC_CHROOT/proc || true
 mount | grep $TC_CHROOT/sys >/dev/null || mount -tsysfs sys $TC_CHROOT/sys || true
 mount | grep $TC_CHROOT/dev/pts >/dev/null || mount -tdevpts devts $TC_CHROOT/dev/pts || true
+cp "$TC_CHROOT/etc/resolv.conf" "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go"
+test -f /etc/resolv.conf && cp /etc/resolv.conf "$TC_CHROOT/etc/resolv.conf"
 chroot "$TC_CHROOT" /x2go_tce_shell.sh
+test -f "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" && mv "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" "$TC_CHROOT/etc/resolv.conf"
 for mountpoint in proc dev/pts sys; do
         while true; do
                 cat /proc/mounts | grep $TC_CHROOT/$mountpoint >/dev/null && umount $TC_CHROOT/$mountpoint || break
diff --git a/x2gothinclientmanagement/share/etc/x2gothinclient_init b/x2gothinclientmanagement/share/etc/x2gothinclient_init
index 6e17a6e..e70cf9e 100755
--- a/x2gothinclientmanagement/share/etc/x2gothinclient_init
+++ b/x2gothinclientmanagement/share/etc/x2gothinclient_init
@@ -23,9 +23,9 @@
 mkdir -p ~x2gothinclient
 mkdir -p ~x2gothinclient/.x2goclient
 test -e /etc/x2go/x2gothinclient_sessions && cp /etc/x2go/x2gothinclient_sessions ~x2gothinclient/.x2goclient/sessions
-test -e /etc/x2go/freerdp/known_hosts && mkdir ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts
+test -e /etc/x2go/freerdp/known_hosts && mkdir -p ~x2gothinclient/.freerdp && cp /etc/x2go/freerdp/known_hosts ~x2gothinclient/.freerdp/known_hosts
 mkdir -p ~x2gothinclient/.kde
-mkdir -p ~x2gothinclient/.kde/socket-`cat /etc/hostname`
+mkdir -p ~x2gothinclient/.kde/socket-`hostname`
 mkdir -p ~x2gothinclient/export
 mkdir -p  ~x2gothinclient/logins
 mkdir -p ~x2gothinclient/.ssh

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).

More information about the x2go-commits mailing list