[X2go-Commits] x2gothinclient.git - tmpfs (branch) updated: 0dc9c37886f18d23ecab155c8b2035cf8797aa9f

[X2go dev team]

The branch, tmpfs has been updated
       via  0dc9c37886f18d23ecab155c8b2035cf8797aa9f (commit)
      from  ca9127b0da95499395f0052d54904f097ff59cee (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 0dc9c37886f18d23ecab155c8b2035cf8797aa9f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 15 22:48:55 2011 +0200

    Do not run management script if there is a problem with the X2go TCE chroot.

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2gothinclientmanagement/bin/x2gothinclient_create |    5 +++++
 .../bin/x2gothinclient_preptftpboot                |    2 +-
 x2gothinclientmanagement/bin/x2gothinclient_shell  |    5 +++++
 x2gothinclientmanagement/bin/x2gothinclient_update |   10 ++++++++++
 .../bin/x2gothinclient_upgrade                     |    5 +++++
 6 files changed, 27 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 6fb5f91..ac8c441 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Improval of syslinux boot screen. 
   * Add x2gothinclient_preptftpboot script.
   * Add man page for x2gothinclient_preptftpboot.
+  * Do not run management script if there is a problem with the X2go TCE chroot.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create
index a98c237..045b370 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_create
+++ b/x2gothinclientmanagement/bin/x2gothinclient_create
@@ -41,6 +41,11 @@ TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
 TC_DEBMIRROR_URL="${TC_DEBMIRROR_URL:-'http://ftp.debian.org/debian'}"
 TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org stable main'}"
 
+test -e "$TC_CHROOT" && { 
+    echo "ERROR: X2go Thin Client chroot already exists at $TC_CHROOT. Clear $TC_BASE/ and then run $(basename $0) again..."
+    exit -1
+}
+
 export LANG=C
 
 mkdir -p $TC_CONFIG
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot
index 9ad5c52..1120723 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot
+++ b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot
@@ -42,7 +42,7 @@ TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
 
 mkdir -p "$TC_TFTP_BOOT"
 
-test -d "$TC_TFTP_BOOT/pxelinux.cfg" && { 
+test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { 
     echo "PXE boot files already found at $TC_TFTP_BOOT. Clear $TC_TFTP_BOOT/ and then run $(basename $0) again..."
     exit -1
 }
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell
index 0d26014..ad69b2b 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/bin/x2gothinclient_shell
@@ -35,6 +35,11 @@ source $ETCDIR/x2gothinclient_settings
 TC_SHELL="${TC_SHELL:-/bin/bash}"
 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
+}
+
 cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF
 #!/bin/bash
 mount /proc &> /dev/null
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_update b/x2gothinclientmanagement/bin/x2gothinclient_update
index fa7c05e..905ffae 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_update
+++ b/x2gothinclientmanagement/bin/x2gothinclient_update
@@ -36,6 +36,16 @@ TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
 TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
 TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
 
+test -e "$TC_CHROOT" || { 
+    echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT. Run x2gothinclient_create to create it..."
+    exit -1
+}
+
+test -e "$TC_CONFIG" || { 
+    echo "ERROR: No X2go Thin Client configuration found at $TC_CONFIG. Please check..."
+    exit -1
+}
+
 mkdir -p "$TC_CHROOT/etc/x2go"
 
 echo "Installing X2go TCE configuration into chroot environment..."
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_upgrade b/x2gothinclientmanagement/bin/x2gothinclient_upgrade
index e1a755b..61a8d98 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/bin/x2gothinclient_upgrade
@@ -34,6 +34,11 @@ 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
+}
+
 cat > "$TC_CHROOT/x2go_tc_update.sh" <<EOF
 #!/bin/bash
 mount /proc &> /dev/null


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