x2gothinclient.git - tmpfs (branch) updated: fec01ed35855bdb6fbb07816bed2eef3ee196198 - x2go-commits

15 Jun 2011

The branch, tmpfs has been updated
       via  fec01ed35855bdb6fbb07816bed2eef3ee196198 (commit)
      from  bb210583a41980923bac1032608369449a6c6bd5 (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 fec01ed35855bdb6fbb07816bed2eef3ee196198
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Jun 15 23:14:05 2011 +0200

    x2gothinclient_cleanup improvements

-----------------------------------------------------------------------

Summary of changes:
 .../bin/x2gothinclient_cleanup                     |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

The diff of changes is:

diff --git a/x2gothinclientmanagement/bin/x2gothinclient_cleanup b/x2gothinclientmanagement/bin/x2gothinclient_cleanup
index d30321f..6a63a85 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_cleanup
+++ b/x2gothinclientmanagement/bin/x2gothinclient_cleanup
@@ -32,7 +32,9 @@ fi
 
 source $ETCDIR/x2gothinclient_settings
 
-TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}"
+TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
+TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
+TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
 TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
 
 [ "x$USER" == "xroot" ] || { 
@@ -46,12 +48,21 @@ echo "-------------------"
 echo "Hit <RETURN> to purge all X2go TCE related files (chroot, PXE boot env), hit STRG-C to cancel the operation!!!"
 read
 
+# CHROOT + TCE config
 test -e "$TC_CHROOT" && {
-    echo "Emptying $TC_CHROOT..."
-    rm -Rf "${TC_CHROOT}"/*
+    echo "Removing $TC_CHROOT..."
+    rm -Rf "${TC_CHROOT}"
 } || {
     echo "WARNING: X2go Thin Client chroot does not exist at $TC_CHROOT. No cleanup necessary..."
 }
+test -e "$TC_CONFIG" && {
+    echo "Removing $TC_CONFIG..."
+    rm -Rf "${TC_CONFIG}"
+} || {
+    echo "WARNING: X2go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..."
+}
+
+### PXE/Syslinux
 test -e "$TC_TFTP_BOOT/pxelinux.cfg" && {
     echo "Emptying $TC_TFTP_BOOT..."
     rm -Rf "${TC_TFTP_BOOT}"/*


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

    