[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.1.0.0-11-g80a0590

[X2Go dev team]

The branch, master has been updated
       via  80a0590385f7380a2ad430cb0d19f0d451a67ec2 (commit)
      from  c60d59ebc3c9b5c55177d62ec6518a04a370c493 (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 80a0590385f7380a2ad430cb0d19f0d451a67ec2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Oct 9 22:31:27 2013 +0200

    Remove chroot bootstrap cruft when finished with creating the TCE chroot.

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

Summary of changes:
 debian/changelog                                   |    2 ++
 .../sbin/x2gothinclient_create                     |   17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b66cc83..5c10a9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
     - Syntax fix in x2gousbmount script.
     - Make ~x2gothinclient rw-able on TCE machines. Thanks to Peter
       Schneider for pointing at this.
+    - Remove chroot bootstrap cruft when finished with creating the
+      TCE chroot.
 
   [ Arnold Krille ]
   * New upstream version (1.1.0.1):
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index bce2405..37a255d 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -22,6 +22,12 @@
 
 set -e
 
+empty_folder() {
+    folder="$1"
+    find "$folder" -type f | while read file; do rm "$file"; done
+    find "$folder" -mindepth 1 -type d | sort -r | while read dir; do rmdir "$dir"; done
+}
+
 if echo $0 | egrep "^./bin/.*$" >/dev/null; then
 	ETCDIR="etc/"
 	SHAREDIR="share/"
@@ -227,7 +233,16 @@ for mountpoint in proc dev/pts sys; do
 	done
 done
 
-rm -f $TC_CHROOT/etc/udev/rules.d/*-persistent-*.rules
+empty_folder "$TC_CHROOT/tmp"
+empty_folder "$TC_CHROOT/root"
+empty_folder "$TC_CHROOT/etc/udev/rules.d"
+empty_folder "$TC_CHROOT/var/log"
+empty_folder "$TC_CHROOT/var/lib/x2gothinclient"
+empty_folder "$TC_CHROOT/media"
+empty_folder "$TC_CHROOT/var/lib/nfs"
+empty_folder "$TC_CHROOT/var/lib/xkb"
+empty_folder "$TC_CHROOT/var/lib/dbus"
+empty_folder "$TC_CHROOT/var/lib/alsa"
 
 x2gothinclient_update
 


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