[X2Go-Commits] [x2gothinclient] 01/06: Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2gothinclient.

commit 8f34827eb49baf5bd30764ff7d962078c09bfb58
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Aug 5 16:41:35 2014 +0200

    Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf.
---
 debian/changelog                                   |    2 ++
 x2gothinclientmanagement/sbin/x2gothinclient_shell |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fd087d3..6cd3a22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low
       X2Go Client as login manager, we launch a minimal MATE desktop and
       connect to X2Go sessions from there.
     - Add COPYING file.
+    - Avoid error message in x2gothinclient_shell if the chroot does not have
+      a file-or-symlink /etc/resolv.conf.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 27 Feb 2014 12:03:00 +0100
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell
index 15dc478..5e2a2fa 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell
@@ -96,7 +96,7 @@ 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 -e "$TC_CHROOT/etc/resolv.conf" && 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

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git