The branch, tmpfs has been updated via bb210583a41980923bac1032608369449a6c6bd5 (commit) from 8b6031bef72e12b3516ef9c169fa7c9c6ab5cdf6 (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 bb210583a41980923bac1032608369449a6c6bd5 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 15 23:07:49 2011 +0200 Add x2gothinclient_cleanup script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + ...gothinclient_upgrade => x2gothinclient_cleanup} | 40 ++++++++++---------- 2 files changed, 21 insertions(+), 20 deletions(-) copy x2gothinclientmanagement/bin/{x2gothinclient_upgrade => x2gothinclient_cleanup} (66%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7b758f4..bb13792 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Do not run management script if there is a problem with the X2go TCE chroot. * X2go TCE management script have to run as root. * Add https_proxy env variable support. + * Add x2gothinclient_cleanup script. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/bin/x2gothinclient_upgrade b/x2gothinclientmanagement/bin/x2gothinclient_cleanup similarity index 66% copy from x2gothinclientmanagement/bin/x2gothinclient_upgrade copy to x2gothinclientmanagement/bin/x2gothinclient_cleanup index e345d5d..d30321f 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/bin/x2gothinclient_cleanup @@ -33,32 +33,32 @@ fi source $ETCDIR/x2gothinclient_settings TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" - -test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT. Run x2gothinclient_create to create it..." - exit -1 -} +TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}" [ "x$USER" == "xroot" ] || { echo "ERROR: X2go Thin Client management scripts have to run as super-user root." exit -2 } -cat > "$TC_CHROOT/x2go_tc_update.sh" <<EOF -#!/bin/bash -mount /proc &> /dev/null -mount /dev/pts &> /dev/null -export HOME=/root +echo "X2go TCE cleanup..." +echo "-------------------" -export http_proxy=$TC_HTTP_PROXY -export https_proxy=$TC_HTTPS_PROXY -export ftp_proxy=$TC_FTP_PROXY +echo "Hit <RETURN> to purge all X2go TCE related files (chroot, PXE boot env), hit STRG-C to cancel the operation!!!" +read -[ $? -eq 0 ] && apt-get update -[ $? -eq 0 ] && apt-get upgrade +test -e "$TC_CHROOT" && { + echo "Emptying $TC_CHROOT..." + rm -Rf "${TC_CHROOT}"/* +} || { + echo "WARNING: X2go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..." +} +test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { + echo "Emptying $TC_TFTP_BOOT..." + rm -Rf "${TC_TFTP_BOOT}"/* +} || { + echo "WARNING: X2go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..." +} -umount -l /proc &> /dev/null -umount -l /dev/pts &> /dev/null -EOF -chmod u+x "$TC_CHROOT/x2go_tc_update.sh" -chroot "$TC_CHROOT" /x2go_tc_update.sh +echo +echo "X2go TCE cleanup is DONE." +echo 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).