This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gothinclient. commit 441467aee30ddcb651a7ed8fe3237ddc060491db Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 5 16:43:47 2014 +0200 Use resolv.conf file from host system when running x2gothinclient_upgrade. --- debian/changelog | 1 + .../sbin/x2gothinclient_upgrade | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6cd3a22..77dc243 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ x2gothinclient (1.1.0.3-0x2go1) UNRELEASED; urgency=low - Add COPYING file. - Avoid error message in x2gothinclient_shell if the chroot does not have a file-or-symlink /etc/resolv.conf. + - Use resolv.conf file from host system when running x2gothinclient_upgrade. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Feb 2014 12:03:00 +0100 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade index d35972a..a580eb8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -97,8 +97,13 @@ mount | grep "$TC_CHROOT/proc" >/dev/null || mount -tproc proc "$TC_CHROOT/proc" 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 +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_upgrade.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 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git