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

14 Jun 2011

The branch, tmpfs has been updated
       via  fc86ce209cf31ff52c0dc7605f48949362c64826 (commit)
       via  90d1bac956ed0e25e0140b535415f3cb975ee71b (commit)
      from  33d3184a8a277cb78a4ec1aed125dc18c0879479 (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 fc86ce209cf31ff52c0dc7605f48949362c64826
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jun 14 23:51:48 2011 +0200

    Add x2gothinclient_preptftpboot script.

commit 90d1bac956ed0e25e0140b535415f3cb975ee71b
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Tue Jun 14 23:33:54 2011 +0200

    Use quotation marks on strings

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2gothinclientmanagement/bin/x2gothinclient_create |   10 ++--
 ...inclient_update => x2gothinclient_preptftpboot} |   41 ++++++++++++++------
 x2gothinclientmanagement/bin/x2gothinclient_shell  |   10 ++--
 x2gothinclientmanagement/bin/x2gothinclient_update |   18 ++++----
 .../bin/x2gothinclient_upgrade                     |    8 ++--
 .../etc/x2gothinclient_settings                    |    4 ++
 7 files changed, 57 insertions(+), 35 deletions(-)
 copy x2gothinclientmanagement/bin/{x2gothinclient_update => x2gothinclient_preptftpboot} (51%)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 5eede21..1c0614c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Add memtest86+ to x2gothinclient's Recommends: section. 
   * Move PXE tftpboot examples to x2gothinclient/share/tftpboot.
   * Improval of syslinux boot screen. 
+  * Add x2gothinclient_preptftpboot script.
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create
index eec6ab8..a98c237 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_create
+++ b/x2gothinclientmanagement/bin/x2gothinclient_create
@@ -35,11 +35,11 @@ fi
 
 source $ETCDIR/x2gothinclient_settings
 
-TC_BASE=${TC_BASE:-/opt/x2gothinclient}
-TC_CHROOT=${TC_CHROOT:-$TC_BASE/chroot}
-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"}
+TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
+TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
+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'}"
 
 export LANG=C
 
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_update b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot
similarity index 51%
copy from x2gothinclientmanagement/bin/x2gothinclient_update
copy to x2gothinclientmanagement/bin/x2gothinclient_preptftpboot
index 06f3ff8..166ff4f 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_update
+++ b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot
@@ -24,28 +24,45 @@ set -e
 
 if echo $0 | egrep "^./bin/.*$" >/dev/null; then
     ETCDIR="etc/"
+    SHAREDIR="share/"
 elif echo $0 | egrep "^./x2gothinclient_.*$" >/dev/null; then
     ETCDIR="../etc"
+    SHAREDIR="../share/"
 else
     ETCDIR=/etc/x2go
+    SHAREDIR="/usr/share/x2go/tce"
 fi
 
 source $ETCDIR/x2gothinclient_settings
 
-TC_BASE=${TC_BASE:-/opt/x2gothinclient}
-TC_CHROOT=${TC_CHROOT:-$TC_BASE/chroot}
-TC_CONFIG=${TC_CONFIG:-$TC_BASE/etc}
+TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
+TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
+TC_TFTP_FILES="${TC_TFTP_FILES:-$SHAREDIR/tftpboot}"
+TC_TFTP_BOOT="${TC_TFTP_BOOT:-/srv/tftp}"
 
-mkdir -p $TC_CHROOT/etc/x2go
+mkdir -p "$TC_TFTP_FILES"
 
-echo "Installing X2go TCE configuration into chroot environment..."
-echo "------------------------------------------------------------"
+echo "Preparing PXE boot configuration for X2go TCE..."
+echo "------------------------------------------------"
+echo
 
-cp -v $TC_CONFIG/x2gothinclient_init $TC_CHROOT/etc/x2go/x2gothinclient_init
-chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init
+echo "Copying X2go's TFTP (syslinux) template files..."
+cp -av "$TC_TFTP_FILES"/* "$TC_TFTP_BOOT"
+echo
 
-cp -v $TC_CONFIG/x2gothinclient_start $TC_CHROOT/etc/x2go/x2gothinclient_start
-chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_start
+echo "Linking files for X2go's TFTP (syslinux) boot environment..."
+cd "$TC_TFTP_BOOT"
 
-cp -v $TC_CONFIG/x2gothinclient_sessions $TC_CHROOT/etc/x2go/x2gothinclient_sessions
-chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_sessions
+# 486 kernel image
+ln -sfv "$TC_TFTP_BOOT/vmlinuz.486" "$TC_CHROOT/vmlinuz.486"
+ln -sfv "$TC_TFTP_BOOT/initrd.img.486" "$TC_CHROOT/initrd.img.486"
+# 686 kernel image
+ln -sfv "$TC_TFTP_BOOT/vmlinuz.686" "$TC_CHROOT/vmlinuz.686"
+ln -sfv "$TC_TFTP_BOOT/initrd.img.686" "$TC_CHROOT/initrd.img.686"
+# memtest86+
+ln -sfv "$TC_TFTP_BOOT/memtest86+.bin" "$TC_CHROOT/boot/memtest86+.bin"
+# syslinux components
+ln -sfv "$TC_TFTP_BOOT/pxelinux.0" "/usr/lib/syslinux/pxelinux.0"
+ln -sfv "$TC_TFTP_BOOT/vesamenu.c32" "/usr/lib/syslinux/vesamenu.c32"
+
+cd - > /dev/null
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell
index 8ff5418..143b4de 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/bin/x2gothinclient_shell
@@ -32,10 +32,10 @@ fi
 
 source $ETCDIR/x2gothinclient_settings
 
-TC_SHELL=${TC_SHELL:-/bin/bash}
-TC_CHROOT=${TC_CHROOT:-/opt/x2gothinclient}
+TC_SHELL="${TC_SHELL:-/bin/bash}"
+TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}"
 
-cat > $TC_CHROOT/x2go_tce_shell.sh <<EOF
+cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF
 #!/bin/bash
 mount /proc
 mount /dev/pts
@@ -56,5 +56,5 @@ echo
 umount -l /proc
 umount -l /dev/pts
 EOF
-chmod u+x $TC_CHROOT/x2go_tce_shell.sh
-chroot $TC_CHROOT /x2go_tce_shell.sh
+chmod u+x "$TC_CHROOT/x2go_tce_shell.sh"
+chroot "$TC_CHROOT" /x2go_tce_shell.sh
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_update b/x2gothinclientmanagement/bin/x2gothinclient_update
index 06f3ff8..fa7c05e 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_update
+++ b/x2gothinclientmanagement/bin/x2gothinclient_update
@@ -32,20 +32,20 @@ fi
 
 source $ETCDIR/x2gothinclient_settings
 
-TC_BASE=${TC_BASE:-/opt/x2gothinclient}
-TC_CHROOT=${TC_CHROOT:-$TC_BASE/chroot}
-TC_CONFIG=${TC_CONFIG:-$TC_BASE/etc}
+TC_BASE="${TC_BASE:-/opt/x2gothinclient}"
+TC_CHROOT="${TC_CHROOT:-$TC_BASE/chroot}"
+TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}"
 
-mkdir -p $TC_CHROOT/etc/x2go
+mkdir -p "$TC_CHROOT/etc/x2go"
 
 echo "Installing X2go TCE configuration into chroot environment..."
 echo "------------------------------------------------------------"
 
-cp -v $TC_CONFIG/x2gothinclient_init $TC_CHROOT/etc/x2go/x2gothinclient_init
+cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init"
 chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_init
 
-cp -v $TC_CONFIG/x2gothinclient_start $TC_CHROOT/etc/x2go/x2gothinclient_start
-chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_start
+cp -v "$TC_CONFIG/x2gothinclient_start" "$TC_CHROOT/etc/x2go/x2gothinclient_start"
+chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_start"
 
-cp -v $TC_CONFIG/x2gothinclient_sessions $TC_CHROOT/etc/x2go/x2gothinclient_sessions
-chmod a+rx $TC_CHROOT/etc/x2go/x2gothinclient_sessions
+cp -v "$TC_CONFIG/x2gothinclient_sessions" "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
+chmod a+rx "$TC_CHROOT/etc/x2go/x2gothinclient_sessions"
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_upgrade b/x2gothinclientmanagement/bin/x2gothinclient_upgrade
index fa9b562..e7a4808 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade
+++ b/x2gothinclientmanagement/bin/x2gothinclient_upgrade
@@ -32,9 +32,9 @@ fi
 
 source $ETCDIR/x2gothinclient_settings
 
-TC_CHROOT=${TC_CHROOT:-/opt/x2gothinclient}
+TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}"
 
-cat > $TC_CHROOT/x2go_tc_update.sh <<EOF
+cat > "$TC_CHROOT/x2go_tc_update.sh" <<EOF
 #!/bin/bash
 mount /proc
 mount /dev/pts
@@ -49,5 +49,5 @@ export ftp_proxy=$TC_FTP_PROXY
 umount -l /proc
 umount -l /dev/pts
 EOF
-chmod u+x $TC_CHROOT/x2go_tc_update.sh
-chroot $TC_CHROOT /x2go_tc_update.sh
+chmod u+x "$TC_CHROOT/x2go_tc_update.sh"
+chroot "$TC_CHROOT" /x2go_tc_update.sh
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings
index c5cba10..af5c905 100644
--- a/x2gothinclientmanagement/etc/x2gothinclient_settings
+++ b/x2gothinclientmanagement/etc/x2gothinclient_settings
@@ -42,6 +42,9 @@ TC_X2GO_DEBURL="deb http://packages.x2go.org/debian stable main"
 TC_HTTP_PROXY=""
 TC_FTP_PROXY=""
 
+# tftp boot environment (PXE/syslinux files delivered via tftpd)
+TC_TFTP_BOOT="/srv/tftp"
+
 echo
 echo "X2go Thin Client Environment:"
 echo "============================="
@@ -56,6 +59,7 @@ echo "TC_DEBMIRROR_URL=$TC_DEBMIRROR_URL"
 echo "TC_X2GO_DEBURL=$TC_X2GO_DEBURL"
 echo "TC_HTTP_PROXY=$TC_HTTP_PROXY"
 echo "TC_FTP_PROXY=$TC_FTP_PROXY"
+echo "TC_TFTP_BOOT=$TC_TFTP_BOOT"
 echo
 echo "Edit /etc/x2go/x2gothinclient_settings to change this."
 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).

    