x2go-commits June 2011

x2go-commits@lists.x2go.org

1 participants
236 discussions

x2gothinclient.git - tmpfs (branch) updated: ba3b46bafd54a5b9bcc8c63dccd8f970abbf7723
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via ba3b46bafd54a5b9bcc8c63dccd8f970abbf7723 (commit) from 7a544b63e9c5391cfd24abfb87def4163f0800cc (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 ba3b46bafd54a5b9bcc8c63dccd8f970abbf7723 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 00:43:45 2011 +0200 improved verbosity after PXE prep... ----------------------------------------------------------------------- Summary of changes: .../bin/x2gothinclient_preptftpboot | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot index c058761..9394afe 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot @@ -79,7 +79,7 @@ cd - > /dev/null echo echo "DONE with X2go PXE/Syslinux environment setup." -echo "Two manual steps are still needed..." +echo "However, two manual steps are still needed..." echo echo "1. Make sure your DHCP server's configuration points to:" @@ -92,3 +92,6 @@ echo echo " Add this line to /etc/exports..." echo " $TC_CHROOT <your-network>/<netmask>(ro,async,no_root_squash)" echo +echo " ... and then restart your NFS server with:" +echo " /etc/init.d/nfs-kernel-server restart" +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).

1 0

x2gothinclient.git - tmpfs (branch) updated: 7a544b63e9c5391cfd24abfb87def4163f0800cc
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via 7a544b63e9c5391cfd24abfb87def4163f0800cc (commit) from 82acdcc105cb83b87695827e58984be718be7a58 (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 7a544b63e9c5391cfd24abfb87def4163f0800cc Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Thu Jun 16 00:30:29 2011 +0200 Run x2gothinclient_init from x2gothinclientd init script. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.init | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f35f9b2..ba4b74d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Add https_proxy env variable support. * Add x2gothinclient_cleanup script. * Add man page for x2gothinclient_cleanup. + * Run x2gothinclient_init from x2gothinclientd init script. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index adc8147..bdaf796 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -38,6 +38,9 @@ DESC=x2gothinclient test -x $DAEMON || exit 0 test -x /etc/x2go/x2gothinclient_init || test -x /etc/x2go/x2gothinclient_start || { echo "X2go thin client system will not start as it is not configured, yet.\nSee http://wiki.x2go.org/installing_x2go_thin_client_environment_debian"; exit 0; } +# pre-init X2go Thin Client through init script... +test -x /etc/x2go/x2gothinclient_init && source /etc/x2go/x2gothinclient_init + set -e case "$1" in 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).

1 0

x2gothinclient.git - tmpfs (branch) updated: 82acdcc105cb83b87695827e58984be718be7a58
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via 82acdcc105cb83b87695827e58984be718be7a58 (commit) from 62c0e9e6a4c7f244379aa1fd90b62ddb1554a7c2 (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 82acdcc105cb83b87695827e58984be718be7a58 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 23:25:01 2011 +0200 Fixed open quotes in x2gothinclient_preptftpboot script ----------------------------------------------------------------------- Summary of changes: .../bin/x2gothinclient_preptftpboot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot index 956dc87..c058761 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot @@ -79,7 +79,7 @@ cd - > /dev/null echo echo "DONE with X2go PXE/Syslinux environment setup." -echo "Two manual steps are still needed... +echo "Two manual steps are still needed..." echo echo "1. Make sure your DHCP server's configuration points to:" 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).

1 0

x2gothinclient.git - tmpfs (branch) updated: 62c0e9e6a4c7f244379aa1fd90b62ddb1554a7c2
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via 62c0e9e6a4c7f244379aa1fd90b62ddb1554a7c2 (commit) from aa0c5cc51a00f6621094ca1e9f8718c51cc7d254 (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 62c0e9e6a4c7f244379aa1fd90b62ddb1554a7c2 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 23:23:33 2011 +0200 Add empty line at end of create script. ----------------------------------------------------------------------- Summary of changes: x2gothinclientmanagement/bin/x2gothinclient_create | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create index 8a78498..c740899 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_create +++ b/x2gothinclientmanagement/bin/x2gothinclient_create @@ -154,3 +154,4 @@ x2gothinclient_update echo echo "X2go Thin Client creation has finished successfully." +echo \ No newline at end of file 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).

1 0

x2gothinclient.git - tmpfs (branch) updated: aa0c5cc51a00f6621094ca1e9f8718c51cc7d254
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via aa0c5cc51a00f6621094ca1e9f8718c51cc7d254 (commit) from fec01ed35855bdb6fbb07816bed2eef3ee196198 (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 aa0c5cc51a00f6621094ca1e9f8718c51cc7d254 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 23:21:02 2011 +0200 Add man page for x2gothinclient_cleanup. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + ...inclient_upgrade.8 => x2gothinclient_cleanup.8} | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) copy x2gothinclientmanagement/man/{x2gothinclient_upgrade.8 => x2gothinclient_cleanup.8} (51%) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index bb13792..f35f9b2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * X2go TCE management script have to run as root. * Add https_proxy env variable support. * Add x2gothinclient_cleanup script. + * Add man page for x2gothinclient_cleanup. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 similarity index 51% copy from x2gothinclientmanagement/man/x2gothinclient_upgrade.8 copy to x2gothinclientmanagement/man/x2gothinclient_cleanup.8 index ce7f42d..d5d14f5 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 @@ -5,25 +5,28 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2gothinclient_upgrade 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.TH x2gothinclient_cleanup 8 "15 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclient_upgrade \- Upgrade the X2go Thin Client's software. +x2gothinclient_cleanup \- Removes the X2go Thin Client environment from the X2go PXE server. .SH SYNOPSIS 'nh .fi .ad l -\fBx2gothinclient_upgrade\fR +\fBx2gothinclient_cleanup\fR .SH DESCRIPTION -This helper script performs a package upgrade within the X2go thin client chroot. Use this script to update/upgrade your -X2go thin client's software. +This helper script removes the complete X2go TCE from your system. The script will +ask you to confirm the removal action. + +Handle with care!!! .PP .SH OPTIONS -\fBx2gothinclient_upgrade\fR has no known options. +\fBx2gothinclient_cleanup\fR has no known options. .PP .SH FILES /etc/x2go/x2gothinclient_settings Configuration file for x2gothinclient_* scripts. + .PP .SH AUTHOR This manual has been written by Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> for the X2go project 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).

1 0

x2gothinclient.git - tmpfs (branch) updated: fec01ed35855bdb6fbb07816bed2eef3ee196198
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

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

1 0

x2gothinclient.git - tmpfs (branch) updated: bb210583a41980923bac1032608369449a6c6bd5
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

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

1 0

x2gothinclient.git - tmpfs (branch) updated: 8b6031bef72e12b3516ef9c169fa7c9c6ab5cdf6
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via 8b6031bef72e12b3516ef9c169fa7c9c6ab5cdf6 (commit) from 75db9d5b6d390f677f892ab10e98c9ababaeef5e (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 8b6031bef72e12b3516ef9c169fa7c9c6ab5cdf6 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 22:57:26 2011 +0200 Add https_proxy env variable support. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gothinclientmanagement/bin/x2gothinclient_create | 2 ++ x2gothinclientmanagement/bin/x2gothinclient_shell | 1 + .../bin/x2gothinclient_upgrade | 1 + .../etc/x2gothinclient_settings | 3 +++ 5 files changed, 8 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index aada42a..7b758f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Add man page for x2gothinclient_preptftpboot. * 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. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create index 54eeb05..8a78498 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_create +++ b/x2gothinclientmanagement/bin/x2gothinclient_create @@ -63,6 +63,7 @@ mkdir -p $TC_CHROOT # use a proxy server for APT (if any is configured) export http_proxy="$TC_HTTP_PROXY" +export https_proxy="$TC_HTTPS_PROXY" export ftp_proxy="$TC_FTP_PROXY" debootstrap --arch i386 stable $TC_CHROOT/ $TC_DEBMIRROR_URL @@ -96,6 +97,7 @@ mount /proc mount /dev/pts export HOME=/root export http_proxy=$TC_HTTP_PROXY +export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY mkdir -p /tmp/user/0 diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell index 750c32e..5e69a8f 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_shell +++ b/x2gothinclientmanagement/bin/x2gothinclient_shell @@ -53,6 +53,7 @@ export HOME=/root # export the proxy server (if any) to the shell. export http_proxy=$TC_HTTP_PROXY +export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY echo 'This shell has been started in your X2go Thin Clients chroot environment. All changes performed here' diff --git a/x2gothinclientmanagement/bin/x2gothinclient_upgrade b/x2gothinclientmanagement/bin/x2gothinclient_upgrade index 36f03eb..e345d5d 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/bin/x2gothinclient_upgrade @@ -51,6 +51,7 @@ mount /dev/pts &> /dev/null export HOME=/root export http_proxy=$TC_HTTP_PROXY +export https_proxy=$TC_HTTPS_PROXY export ftp_proxy=$TC_FTP_PROXY [ $? -eq 0 ] && apt-get update diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index af5c905..758efcc 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -38,8 +38,10 @@ TC_X2GO_DEBURL="deb http://packages.x2go.org/debian stable main" # Use a http/ftp proxy during debootstrap (leave empty if direct connections to http/ftp are allowed) # TC_HTTP_PROXY="http://proxy.mydomain.com:8080" +# TC_HTTPS_PROXY="http://proxy.mydomain.com:8080" # TC_FTP_PROXY="http://proxy.mydomain.com:8080" TC_HTTP_PROXY="" +TC_HTTPS_PROXY="" TC_FTP_PROXY="" # tftp boot environment (PXE/syslinux files delivered via tftpd) @@ -58,6 +60,7 @@ echo "TC_SHELL=$TC_SHELL" echo "TC_DEBMIRROR_URL=$TC_DEBMIRROR_URL" echo "TC_X2GO_DEBURL=$TC_X2GO_DEBURL" echo "TC_HTTP_PROXY=$TC_HTTP_PROXY" +echo "TC_HTTPS_PROXY=$TC_HTTPS_PROXY" echo "TC_FTP_PROXY=$TC_FTP_PROXY" echo "TC_TFTP_BOOT=$TC_TFTP_BOOT" 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).

1 0

x2gothinclient.git - tmpfs (branch) updated: 75db9d5b6d390f677f892ab10e98c9ababaeef5e
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

The branch, tmpfs has been updated via 75db9d5b6d390f677f892ab10e98c9ababaeef5e (commit) from 0dc9c37886f18d23ecab155c8b2035cf8797aa9f (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 75db9d5b6d390f677f892ab10e98c9ababaeef5e Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 22:53:39 2011 +0200 X2go TCE management script have to run as root. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + x2gothinclientmanagement/bin/x2gothinclient_create | 5 +++++ .../bin/x2gothinclient_preptftpboot | 5 +++++ x2gothinclientmanagement/bin/x2gothinclient_shell | 5 +++++ x2gothinclientmanagement/bin/x2gothinclient_update | 5 +++++ .../bin/x2gothinclient_upgrade | 5 +++++ 6 files changed, 26 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ac8c441..aada42a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * 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. + * X2go TCE management script have to run as root. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create index 045b370..54eeb05 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_create +++ b/x2gothinclientmanagement/bin/x2gothinclient_create @@ -46,6 +46,11 @@ test -e "$TC_CHROOT" && { exit -1 } +[ "x$USER" == "xroot" ] || { + echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + exit -2 +} + export LANG=C mkdir -p $TC_CONFIG diff --git a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot index 1120723..956dc87 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot @@ -47,6 +47,11 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { exit -1 } +[ "x$USER" == "xroot" ] || { + echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + exit -2 +} + echo "Preparing PXE boot configuration for X2go TCE..." echo "------------------------------------------------" echo diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell index ad69b2b..750c32e 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_shell +++ b/x2gothinclientmanagement/bin/x2gothinclient_shell @@ -40,6 +40,11 @@ test -e "$TC_CHROOT" || { exit -1 } +[ "x$USER" == "xroot" ] || { + echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + exit -2 +} + 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 905ffae..721e173 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_update +++ b/x2gothinclientmanagement/bin/x2gothinclient_update @@ -46,6 +46,11 @@ test -e "$TC_CONFIG" || { exit -1 } +[ "x$USER" == "xroot" ] || { + echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + exit -2 +} + 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 61a8d98..36f03eb 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/bin/x2gothinclient_upgrade @@ -39,6 +39,11 @@ test -e "$TC_CHROOT" || { exit -1 } +[ "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 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).

1 0

x2gothinclient.git - tmpfs (branch) updated: 0dc9c37886f18d23ecab155c8b2035cf8797aa9f
by git-admin＠x2go.org 15 Jun '11

15 Jun '11

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

1 0

← Newer
1
...
16
17
18
19
20
21
22
23
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits June 2011