The branch, tmpfs has been updated via ca9127b0da95499395f0052d54904f097ff59cee (commit) via f315eb97f34256dc00eeadcfafa30f253a8c228b (commit) via 72e7e4ddd25d73412afacbe6489b0db3f7f728f9 (commit) from e8ace387e99645094a91e1d7a72ad8057a099d9f (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 ca9127b0da95499395f0052d54904f097ff59cee Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 15 17:55:30 2011 +0200 More verbose comment at end of x2gothinclient_prepftpboot script commit f315eb97f34256dc00eeadcfafa30f253a8c228b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 15 17:48:28 2011 +0200 Symlinks fixed. commit 72e7e4ddd25d73412afacbe6489b0db3f7f728f9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Wed Jun 15 17:46:13 2011 +0200 Using quotation marks... ----------------------------------------------------------------------- Summary of changes: .../bin/x2gothinclient_preptftpboot | 25 ++++++++++++------- x2gothinclientmanagement/bin/x2gothinclient_shell | 6 ++-- 2 files changed, 19 insertions(+), 12 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot index a0d8a35..9ad5c52 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/bin/x2gothinclient_preptftpboot @@ -59,24 +59,31 @@ echo "Linking files for X2go's TFTP (syslinux) boot environment..." cd "$TC_TFTP_BOOT" # 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" +ln -sfv "$TC_CHROOT/vmlinuz.486" "$TC_TFTP_BOOT/vmlinuz.486" +ln -sfv "$TC_CHROOT/initrd.img.486" "$TC_TFTP_BOOT/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" +ln -sfv "$TC_CHROOT/vmlinuz.686" "$TC_TFTP_BOOT/vmlinuz.686" +ln -sfv "$TC_CHROOT/initrd.img.686" "$TC_TFTP_BOOT/initrd.img.686" # memtest86+ -ln -sfv "$TC_TFTP_BOOT/memtest86+.bin" "$TC_CHROOT/boot/memtest86+.bin" +ln -sfv "$TC_CHROOT/boot/memtest86+.bin" "$TC_TFTP_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" +ln -sfv "/usr/lib/syslinux/pxelinux.0" "$TC_TFTP_BOOT/pxelinux.0" +ln -sfv "/usr/lib/syslinux/vesamenu.c32" "$TC_TFTP_BOOT/vesamenu.c32" cd - > /dev/null echo -echo "DONE with PXE/Syslinux environment setup." +echo "DONE with X2go PXE/Syslinux environment setup." +echo "Two manual steps are still needed... + echo -echo "Make sure your DHCP server's configuration points to:" +echo "1. Make sure your DHCP server's configuration points to:" echo echo " next-server <IP-or-hostname-of-this-server>;" echo " filename '/pxelinux.0';" echo +echo "2. Export the X2go Thin Client chroot environment via NFSv3:" +echo +echo " Add this line to /etc/exports..." +echo " $TC_CHROOT <your-network>/<netmask>(ro,async,no_root_squash)" +echo diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell index 98fede0..0d26014 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_shell +++ b/x2gothinclientmanagement/bin/x2gothinclient_shell @@ -45,10 +45,10 @@ export HOME=/root export http_proxy=$TC_HTTP_PROXY export ftp_proxy=$TC_FTP_PROXY -echo This shell has been started in your X2go Thin Clients chroot environment. All changes performed here -echo will take effect on your X2go Thin Clients after their next (re)boot. So be careful!!! +echo 'This shell has been started in your X2go Thin Clients chroot environment. All changes performed here' +echo 'will take effect on your X2go Thin Clients after their next (re)boot. So be careful!!!' echo -echo To return from this chroot shell hit STRG+D or type exit on the command line... +echo 'To return from this chroot shell hit STRG+D or type ,,exit'' on the command line...' echo /bin/$TC_SHELL 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).