x2go-commits June 2011

x2go-commits@lists.x2go.org

1 participants
236 discussions

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

15 Jun '11

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 ------------------------------------------------------… [View More]----------- commit ca9127b0da95499395f0052d54904f097ff59cee Author: Mike Gabriel <mike.gabriel(a)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(a)das-netzwerkteam.de> Date: Wed Jun 15 17:48:28 2011 +0200 Symlinks fixed. commit 72e7e4ddd25d73412afacbe6489b0db3f7f728f9 Author: Mike Gabriel <mike.gabriel(a)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). [View Less]

1 0

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

14 Jun '11

The branch, tmpfs has been updated via e8ace387e99645094a91e1d7a72ad8057a099d9f (commit) from 644c67dafb490bc6eaa5a4f7a8879cb3c86df548 (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 e8ace387e99645094a91e1d7a72ad8057a099d9f Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]

1 0

x2gothinclient.git - tmpfs (branch) updated: 644c67dafb490bc6eaa5a4f7a8879cb3c86df548
by git-admin＠x2go.org 14 Jun '11

14 Jun '11

The branch, tmpfs has been updated via 644c67dafb490bc6eaa5a4f7a8879cb3c86df548 (commit) from 3ff0240b43e1540901a9a500ca653619213ac116 (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 644c67dafb490bc6eaa5a4f7a8879cb3c86df548 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]

1 0

x2gothinclient.git - tmpfs (branch) updated: 3ff0240b43e1540901a9a500ca653619213ac116
by git-admin＠x2go.org 14 Jun '11

14 Jun '11

The branch, tmpfs has been updated via 3ff0240b43e1540901a9a500ca653619213ac116 (commit) via 96aa9d8380fef27e38d2605cd758a46fdda98313 (commit) from 8ec9cae88234569b0f834a6c1879dea3c0b8f81b (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 3ff0240b43e1540901a9a500ca653619213ac116 … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 00:45:18 2011 +0200 Silence mounts/unmounts commit 96aa9d8380fef27e38d2605cd758a46fdda98313 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Wed Jun 15 00:45:08 2011 +0200 Revert one line of last commit. ----------------------------------------------------------------------- Summary of changes: x2gothinclientmanagement/bin/x2gothinclient_shell | 2 +- .../bin/x2gothinclient_upgrade | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell index 604127c..6798ca0 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_shell +++ b/x2gothinclientmanagement/bin/x2gothinclient_shell @@ -39,7 +39,7 @@ cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF #!/bin/bash mount /proc &> /dev/null mount /dev/pts &> /dev/null -export HOME=/root &> /dev/null +export HOME=/root # export the proxy server (if any) to the shell. export http_proxy=$TC_HTTP_PROXY diff --git a/x2gothinclientmanagement/bin/x2gothinclient_upgrade b/x2gothinclientmanagement/bin/x2gothinclient_upgrade index e7a4808..e1a755b 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/bin/x2gothinclient_upgrade @@ -36,8 +36,8 @@ TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" cat > "$TC_CHROOT/x2go_tc_update.sh" <<EOF #!/bin/bash -mount /proc -mount /dev/pts +mount /proc &> /dev/null +mount /dev/pts &> /dev/null export HOME=/root export http_proxy=$TC_HTTP_PROXY @@ -46,8 +46,8 @@ export ftp_proxy=$TC_FTP_PROXY [ $? -eq 0 ] && apt-get update [ $? -eq 0 ] && apt-get upgrade -umount -l /proc -umount -l /dev/pts +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 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). [View Less]

1 0

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

14 Jun '11

The branch, tmpfs has been updated via 8ec9cae88234569b0f834a6c1879dea3c0b8f81b (commit) from 45a6c65af09dd27e9ca1cfb3836031a6d84519fe (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 8ec9cae88234569b0f834a6c1879dea3c0b8f81b Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]Date: Wed Jun 15 00:41:53 2011 +0200 Fix x2gothinclient_shell, silence mounts/umounts ----------------------------------------------------------------------- Summary of changes: x2gothinclientmanagement/bin/x2gothinclient_shell | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) The diff of changes is: diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell index 143b4de..604127c 100755 --- a/x2gothinclientmanagement/bin/x2gothinclient_shell +++ b/x2gothinclientmanagement/bin/x2gothinclient_shell @@ -37,24 +37,24 @@ TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" cat > "$TC_CHROOT/x2go_tce_shell.sh" <<EOF #!/bin/bash -mount /proc -mount /dev/pts -export HOME=/root +mount /proc &> /dev/null +mount /dev/pts &> /dev/null +export HOME=/root &> /dev/null # export the proxy server (if any) to the shell. 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 an effect on your X2go Thin Clients after next boot. So be careful!!!" +echo This shell has been started in your X2go Thin Clients chroot environment. All changes performed here +echo will take an effect on your X2go Thin Clients after next 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 -umount -l /proc -umount -l /dev/pts +umount -l /proc &> /dev/null +umount -l /dev/pts &> /dev/null EOF chmod u+x "$TC_CHROOT/x2go_tce_shell.sh" chroot "$TC_CHROOT" /x2go_tce_shell.sh 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). [View Less]

1 0

x2gothinclient.git - tmpfs (branch) updated: 45a6c65af09dd27e9ca1cfb3836031a6d84519fe
by git-admin＠x2go.org 14 Jun '11

14 Jun '11

The branch, tmpfs has been updated via 45a6c65af09dd27e9ca1cfb3836031a6d84519fe (commit) from ca8cd81de0ff7d6e62c4dc1a5a6b398356b59332 (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 45a6c65af09dd27e9ca1cfb3836031a6d84519fe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]

1 0

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

14 Jun '11

The branch, tmpfs has been updated via ca8cd81de0ff7d6e62c4dc1a5a6b398356b59332 (commit) from 10f4efd4d4f23902df6dd34b3c0e5231b2947f11 (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 ca8cd81de0ff7d6e62c4dc1a5a6b398356b59332 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]Date: Wed Jun 15 00:31:25 2011 +0200 Remove symlinks from tftpboot template configuration ----------------------------------------------------------------------- Summary of changes: .../share/tftpboot/initrd.img.486 | 1 - .../share/tftpboot/initrd.img.686 | 1 - .../share/tftpboot/memtest86+.bin | 1 - x2gothinclientmanagement/share/tftpboot/pxelinux.0 | 1 - .../share/tftpboot/vesamenu.c32 | 1 - .../share/tftpboot/vmlinuz.486 | 1 - .../share/tftpboot/vmlinuz.686 | 1 - 7 files changed, 0 insertions(+), 7 deletions(-) delete mode 120000 x2gothinclientmanagement/share/tftpboot/initrd.img.486 delete mode 120000 x2gothinclientmanagement/share/tftpboot/initrd.img.686 delete mode 120000 x2gothinclientmanagement/share/tftpboot/memtest86+.bin delete mode 120000 x2gothinclientmanagement/share/tftpboot/pxelinux.0 delete mode 120000 x2gothinclientmanagement/share/tftpboot/vesamenu.c32 delete mode 120000 x2gothinclientmanagement/share/tftpboot/vmlinuz.486 delete mode 120000 x2gothinclientmanagement/share/tftpboot/vmlinuz.686 The diff of changes is: diff --git a/x2gothinclientmanagement/share/tftpboot/initrd.img.486 b/x2gothinclientmanagement/share/tftpboot/initrd.img.486 deleted file mode 120000 index fc94893..0000000 --- a/x2gothinclientmanagement/share/tftpboot/initrd.img.486 +++ /dev/null @@ -1 +0,0 @@ -/opt/x2gothinclient/chroot/initrd.img.old \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/initrd.img.686 b/x2gothinclientmanagement/share/tftpboot/initrd.img.686 deleted file mode 120000 index a4d7dbc..0000000 --- a/x2gothinclientmanagement/share/tftpboot/initrd.img.686 +++ /dev/null @@ -1 +0,0 @@ -/opt/x2gothinclient/chroot/initrd.img \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/memtest86+.bin b/x2gothinclientmanagement/share/tftpboot/memtest86+.bin deleted file mode 120000 index cba533a..0000000 --- a/x2gothinclientmanagement/share/tftpboot/memtest86+.bin +++ /dev/null @@ -1 +0,0 @@ -/opt/x2gothinclient/chroot/boot/memtest86+.bin \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/pxelinux.0 b/x2gothinclientmanagement/share/tftpboot/pxelinux.0 deleted file mode 120000 index 0f93aef..0000000 --- a/x2gothinclientmanagement/share/tftpboot/pxelinux.0 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/pxelinux.0 \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/vesamenu.c32 b/x2gothinclientmanagement/share/tftpboot/vesamenu.c32 deleted file mode 120000 index d06c444..0000000 --- a/x2gothinclientmanagement/share/tftpboot/vesamenu.c32 +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/syslinux/vesamenu.c32 \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/vmlinuz.486 b/x2gothinclientmanagement/share/tftpboot/vmlinuz.486 deleted file mode 120000 index f7680da..0000000 --- a/x2gothinclientmanagement/share/tftpboot/vmlinuz.486 +++ /dev/null @@ -1 +0,0 @@ -/opt/x2gothinclient/chroot/vmlinuz.486 \ No newline at end of file diff --git a/x2gothinclientmanagement/share/tftpboot/vmlinuz.686 b/x2gothinclientmanagement/share/tftpboot/vmlinuz.686 deleted file mode 120000 index d75d1d6..0000000 --- a/x2gothinclientmanagement/share/tftpboot/vmlinuz.686 +++ /dev/null @@ -1 +0,0 @@ -/opt/x2gothinclient/chroot/vmlinuz.686 \ 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). [View Less]

1 0

x2gothinclient.git - tmpfs (branch) updated: 10f4efd4d4f23902df6dd34b3c0e5231b2947f11
by git-admin＠x2go.org 14 Jun '11

14 Jun '11

The branch, tmpfs has been updated via 10f4efd4d4f23902df6dd34b3c0e5231b2947f11 (commit) from 6a0f93df87a3e2ae3226b1e15d548fc21ecc15a3 (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 10f4efd4d4f23902df6dd34b3c0e5231b2947f11 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]Date: Wed Jun 15 00:08:22 2011 +0200 Add man page for x2gothinclient_preptftpboot. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + .../man/x2gothinclient_preptftpboot.8 | 36 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1c0614c..6fb5f91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low * Move PXE tftpboot examples to x2gothinclient/share/tftpboot. * Improval of syslinux boot screen. * Add x2gothinclient_preptftpboot script. + * Add man page for x2gothinclient_preptftpboot. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Sat, 28 May 2011 12:04:34 +0200 diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 new file mode 100644 index 0000000..379b3ff --- /dev/null +++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 @@ -0,0 +1,36 @@ +'\" -*- coding: utf-8 -*- +.if \n(.g .ds T< \\FC +.if \n(.g .ds T> \\F[\n[.fam]] +.de URL +\\$2 \(la\\$1\(ra\\$3 +.. +.if \n(.g .mso www.tmac +.TH x2gothinclient_preptftpboot 8 "14 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" +.SH NAME +x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2go PXE Server. +.SH SYNOPSIS +'nh +.fi +.ad l +\fBx2gothinclient_preptftpboot\fR + +.SH DESCRIPTION +This helper script prepares X2go's PXE/Syslinux boot environment. As X2go PXE +server you can either use your X2go server itself or a dedicated machine or VM that merely serves +as PXE boot server. + +Please run the \fBx2gothinclient_create\fR helper script first before you run this script. + +This script can only be called if the PXE boot dir (default: /srv/tftp) does not already +contain any other PXE/Syslinux boot environment. +.PP +.SH OPTIONS +\fBx2gothinclient_pretftpboot\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 +(http://www.x2go.org). 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). [View Less]

1 0

x2gothinclient.git - tmpfs (branch) updated: 6a0f93df87a3e2ae3226b1e15d548fc21ecc15a3
by git-admin＠x2go.org 14 Jun '11

14 Jun '11

The branch, tmpfs has been updated via 6a0f93df87a3e2ae3226b1e15d548fc21ecc15a3 (commit) from fc86ce209cf31ff52c0dc7605f48949362c64826 (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 6a0f93df87a3e2ae3226b1e15d548fc21ecc15a3 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> … [View More]

1 0

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

14 Jun '11

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 … [View More]Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Tue Jun 14 23:51:48 2011 +0200 Add x2gothinclient_preptftpboot script. commit 90d1bac956ed0e25e0140b535415f3cb975ee71b Author: Mike Gabriel <mike.gabriel(a)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(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 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). [View Less]

1 0

← Newer
1
...
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