[X2Go-Commits] [x2gothinclient] 01/01: Don't choke if /etc/resolv.conf in the TCE chroot is a symbolic link (in x2gothinclient_shell, x2gothinclient_upgrade).
git-admin at x2go.org
git-admin at x2go.org
Fri Sep 12 09:48:55 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2gothinclient.
commit 45be983174c124d5b589f7dab70cf849f28ea5b5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Sep 12 09:48:29 2014 +0200
Don't choke if /etc/resolv.conf in the TCE chroot is a symbolic link (in x2gothinclient_shell, x2gothinclient_upgrade).
---
debian/changelog | 2 ++
management/sbin/x2gothinclient_shell | 8 ++++++--
management/sbin/x2gothinclient_upgrade | 8 ++++++--
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dcc15aa..1dcda98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ x2gothinclient (1.5.0.0-0x2go1) UNRELEASED; urgency=low
option in x2gothinclient_settings: TC_FLAVOUR (can be: minidesktop or
displaymanager).
- Use proper quotations in several X2Go TCE scripts.
+ - Don't choke if /etc/resolv.conf in the TCE chroot is a symbolic link
+ (in x2gothinclient_shell, x2gothinclient_upgrade).
* debian/control:
+ Rename bin:package: x2gothinclient -> x2gothinclient-daemon.
+ Make sure x2gothinclient-minidesktop pulls in X11 and X2Go Client.
diff --git a/management/sbin/x2gothinclient_shell b/management/sbin/x2gothinclient_shell
index 45e5859..8125605 100755
--- a/management/sbin/x2gothinclient_shell
+++ b/management/sbin/x2gothinclient_shell
@@ -97,12 +97,16 @@ 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
-test -e "$TC_CHROOT/etc/resolv.conf" && cp "$TC_CHROOT/etc/resolv.conf" "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go"
+if [ -f "$TC_CHROOT/etc/resolv.conf" ] || [ -h "$TC_CHROOT/etc/resolv.conf" ]; then
+ mv "$TC_CHROOT/etc/resolv.conf" "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go"
+fi
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"
+if [ -f "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" ] || [ -h "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" ]; then
+ mv "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" "$TC_CHROOT/etc/resolv.conf"
+fi
for mountpoint in proc dev/pts sys; do
while true; do
diff --git a/management/sbin/x2gothinclient_upgrade b/management/sbin/x2gothinclient_upgrade
index 080342a..80244aa 100755
--- a/management/sbin/x2gothinclient_upgrade
+++ b/management/sbin/x2gothinclient_upgrade
@@ -102,12 +102,16 @@ 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"
+if [ -f "$TC_CHROOT/etc/resolv.conf" ] || [ -h "$TC_CHROOT/etc/resolv.conf" ]; then
+ mv "$TC_CHROOT/etc/resolv.conf" "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go"
+fi
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"
+if [ -f "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" ] || [ -h "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" ]; then
+ mv "$TC_CHROOT/etc/resolv.conf.disabled-by-x2go" "$TC_CHROOT/etc/resolv.conf"
+fi
for mountpoint in proc dev/pts sys; do
while true; do
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gothinclient.git
More information about the x2go-commits
mailing list