The branch, master has been updated via 772bfa86e94c4ce6b86850b776096895a9b27582 (commit) via 4138ea8a0316d05f0e42c7eccc5f12326c5d5279 (commit) via 18d185098ca54ba8cf3c8f7f672be08da0d51cf8 (commit) via ce640fbf1d3aad812b116f83b5991db24df8c20a (commit) from b142761be964562cebfa21b724f158928923cbfe (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 772bfa86e94c4ce6b86850b776096895a9b27582 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 17 13:43:55 2012 +0100 Rename every X2go string (in docs, screen output, etc.) to X2Go. commit 4138ea8a0316d05f0e42c7eccc5f12326c5d5279 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 17 13:39:20 2012 +0100 Pre-select example session after X2Go thin client has booted. commit 18d185098ca54ba8cf3c8f7f672be08da0d51cf8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jan 17 13:38:10 2012 +0100 Install alsa-base in X2Go TCE chroot and tmpfs mount /var/lib/alsa. commit ce640fbf1d3aad812b116f83b5991db24df8c20a Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 3 10:44:30 2011 +0100 Fix default value for shell in x2gothinclient_shell script. ----------------------------------------------------------------------- Summary of changes: README.howto | 6 ++-- debian/changelog | 13 +++++--- debian/control | 32 ++++++++++---------- debian/copyright | 2 +- debian/x2gocdmanager.init | 6 ++-- debian/x2gothinclient.init | 8 ++-- x2gocdmanager/man/x2gocdmanager.8 | 6 ++-- x2gocdmanager/man/x2goejectcd.1 | 6 ++-- x2gocdmanager/x2gocdmanager | 6 ++-- x2gosmartcardrules/man/x2gognupgccid.8 | 6 ++-- x2gothinclient/man/x2gothinclientd.8 | 6 ++-- x2gothinclient/sbin/x2gothinclientd | 6 ++-- .../etc/x2gothinclient_settings | 20 ++++++------ .../man/x2gothinclient_cleanup.8 | 6 ++-- .../man/x2gothinclient_create.8 | 8 ++-- .../man/x2gothinclient_preptftpboot.8 | 10 +++--- .../man/x2gothinclient_shell.8 | 8 ++-- .../man/x2gothinclient_update.8 | 8 ++-- .../man/x2gothinclient_upgrade.8 | 6 ++-- .../sbin/x2gothinclient_cleanup | 16 +++++----- .../sbin/x2gothinclient_create | 17 +++++----- .../sbin/x2gothinclient_preptftpboot | 18 +++++----- x2gothinclientmanagement/sbin/x2gothinclient_shell | 18 +++++----- .../sbin/x2gothinclient_update | 14 ++++---- .../sbin/x2gothinclient_upgrade | 10 +++--- .../share/tftpboot/default.cfg | 4 +- .../share/tftpboot/x2go-tce.cfg | 4 +- x2gothinclientmanagement/share/x2gothinclient_init | 6 ++-- .../share/x2gothinclient_sessions | 2 +- .../share/x2gothinclient_start | 7 ++-- x2gothinshutdown/man/thinshutdown.1 | 6 ++-- x2gousbmount/man/x2gousbmount.8 | 6 ++-- x2gousbmount/x2gousbmount | 6 ++-- 33 files changed, 154 insertions(+), 149 deletions(-) mode change 100755 => 100644 debian/rules mode change 100755 => 100644 x2gocdmanager/x2gocdmanager mode change 100755 => 100644 x2gosmartcardrules/x2gognupgccid mode change 100755 => 100644 x2gothinclient/sbin/x2gothinclientd mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_cleanup mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_create mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_shell mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_update mode change 100755 => 100644 x2gothinclientmanagement/sbin/x2gothinclient_upgrade mode change 100755 => 100644 x2gothinclientmanagement/share/x2gothinclient_init mode change 100755 => 100644 x2gothinclientmanagement/share/x2gothinclient_start mode change 100755 => 100644 x2gousbmount/x2gousbmount The diff of changes is: diff --git a/README.howto b/README.howto index f2e8f43..66c1de7 100644 --- a/README.howto +++ b/README.howto @@ -26,7 +26,7 @@ Install TCE: $ echo x2gothinclient > /opt/x2gothinclient/etc/hostname $ echo "127.0.0.1 localhost" >> /opt/x2gothinclient/etc/hosts -Repeat these steps for any of your X2go servers: +Repeat these steps for any of your X2Go servers: <TODO: REVIEW/FIXME (use aptitude instead of apt-get)> $ echo "192.168.0.1 x2goserver" >> /opt/x2gothinclient/etc/hosts @@ -113,8 +113,8 @@ NFS (/etc/exports): X2go Server in LDAP ------------------- -Do not forget to store you X2go servers in LDAP. Use +Do not forget to store you X2Go servers in LDAP. Use $ ldap.addserver <name> <ip> -to add an X2go server to the LDAP tree. +to add an X2Go server to the LDAP tree. diff --git a/debian/changelog b/debian/changelog index a1a0139..10fad12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,10 @@ x2gothinclient (1.0.1.4-0~x2go1) UNRELEASED; urgency=low * New upstream version (1.0.1.4): - - Continue development... + - Fix default value for shell in x2gothinclient_shell script. + - Install alsa-base in X2Go TCE chroot and tmpfs mount /var/lib/alsa. + - Pre-select example session after X2Go thin client has booted. + - Rename every X2go string (in docs, screen output, etc.) to X2Go. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 13 Oct 2011 01:45:23 +0200 @@ -16,15 +19,15 @@ x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low - Add HTTP_PROXY and FTP_PROXY support to x2gothinclientmanagement (APT package download) - Add example files/symlinks for tftpboot environment. - - Add syslinux boot splash with X2go flavour. + - Add syslinux boot splash with X2Go flavour. - Install 486 and 686 kernels in TCE chroot. - Move PXE tftpboot examples to x2gothinclient/share/tftpboot. - 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 + - Do not run management script if there is a problem with the X2Go TCE chroot. - - Sanity checks: X2go TCE management script have to run as root. + - Sanity checks: X2Go TCE management script have to run as root. - Add HTTPS_PROXY support. - Add x2gothinclient_cleanup script. - Add man page for x2gothinclient_cleanup. @@ -33,7 +36,7 @@ x2gothinclient (1.0.1.3-0~x2go1) unstable; urgency=low - Fix udev rules path in x2gousbmount. - Add comment that names possible boot profiles to tftp config template. - Add kernel module blacklisting for x2gothinclient_create. - - Tweak mtab diversion on X2go Thin Client to avoid error messages. + - Tweak mtab diversion on X2Go Thin Client to avoid error messages. - Add some more PXE/TFTP info at end of x2gothinclient_pretftpboot script. - Disable service restarts in chroot. - Add a ,,hit <RETURN> before TCE creation. diff --git a/debian/control b/debian/control index a94fe08..4348bf8 100644 --- a/debian/control +++ b/debian/control @@ -25,8 +25,8 @@ Recommends: nfs-kernel-server Suggests: dhcp3-server | dnsmasq | isc-dhcp-server -Description: Management tools for X2go thin client chroot server - X2go is a server based computing environment with +Description: Management tools for X2Go thin client chroot server + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -37,7 +37,7 @@ Description: Management tools for X2go thin client chroot server x2gothinclientmanagement: ------------------------- IMPORTANT: Install this package on the chroot server that - provides X2go thin client images over PXE/Etherboot. + provides X2Go thin client images over PXE/Etherboot. . For chroot servers we recommend a very separate machine (not your main server on your network) that only serves this purpose. @@ -62,7 +62,7 @@ Recommends: acpid, memtest86+ Description: login daemon starting x2goclient in displaymanager mode - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -72,15 +72,15 @@ Description: login daemon starting x2goclient in displaymanager mode . x2gothinclient: --------------- - IMPORTANT: Use this Package only for the X2go THIN CLIENT ENVIRONMENT + IMPORTANT: Use this Package only for the X2Go THIN CLIENT ENVIRONMENT (This package is meant to be installed in a CHROOT environment!!!) . This package starts x2goclient in fullscreen mode---without window decorations, without menu and toolbar and optionally with enabled LDAP support. The - package ships the core X2go thin client daemon that guards over + package ships the core X2Go thin client daemon that guards over x2goclient functionality. . - x2goclient will behave like xdm, kdm or gdm on X2go thin clients. + x2goclient will behave like xdm, kdm or gdm on X2Go thin clients. Package: x2gousbmount Architecture: all @@ -89,7 +89,7 @@ Depends: udev, cryptsetup Description: clientside usb mass-storage device mounting - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -103,7 +103,7 @@ Description: clientside usb mass-storage device mounting (This package is meant to be installed in a CHROOT environment!!!) . This package adds client-side USB mass storage device mounting using - UDEV rules to your X2go thin client. + UDEV rules to your X2Go thin client. Package: x2gocdmanager Architecture: any @@ -114,7 +114,7 @@ Depends: lsscsi, eject, Description: clientside daemon enabling automatic CD-Rom mounting - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -127,8 +127,8 @@ Description: clientside daemon enabling automatic CD-Rom mounting IMPORTANT: Use this Package only for the x2go THIN CLIENT ENVIRONMENT (This package is meant to be installed in a CHROOT environment!!!) . - This package adds a client-side daemon to your X2go thin client that enables - automatic CD-ROM mounting within thin client X2go sessions. + This package adds a client-side daemon to your X2Go thin client that enables + automatic CD-ROM mounting within thin client X2Go sessions. Package: x2gothinshutdown Architecture: any @@ -138,8 +138,8 @@ Depends: libqt4-gui, Conflicts: x2gocdmanager (<= 1.0.1.2-0~) -Description: shutdown button for X2go thin client - X2go is a server based computing environment with +Description: shutdown button for X2Go thin client + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support @@ -153,7 +153,7 @@ Description: shutdown button for X2go thin client (This package is meant to be installed in a CHROOT environment!!!) . This package provides an on-screen power-off button (Qt4) for shutting - down your X2go thin client. + down your X2Go thin client. Package: x2gosmartcardrules Architecture: all @@ -161,7 +161,7 @@ Depends: ${misc:Depends}, udev Description: UDEV rules for smartcard readers - X2go is a server based computing environment with + X2Go is a server based computing environment with - session resuming - low bandwith support - LDAP support diff --git a/debian/copyright b/debian/copyright index d3e1836..9c08883 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ Upstream Authors: Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Copyright (C) 2007-2011 X2go project / obviously nice - http://wiki.x2go.org +Copyright (C) 2007-2011 X2Go project / obviously nice - http://wiki.x2go.org This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/debian/rules b/debian/rules old mode 100755 new mode 100644 diff --git a/debian/x2gocdmanager.init b/debian/x2gocdmanager.init index d222cce..7857938 100644 --- a/debian/x2gocdmanager.init +++ b/debian/x2gocdmanager.init @@ -1,16 +1,16 @@ #! /bin/sh -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init index 9b305a5..8f22ecb 100644 --- a/debian/x2gothinclient.init +++ b/debian/x2gothinclient.init @@ -1,16 +1,16 @@ #! /bin/sh -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -38,7 +38,7 @@ 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... +# pre-init X2Go Thin Client through init script... test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init set -e diff --git a/x2gocdmanager/man/x2gocdmanager.8 b/x2gocdmanager/man/x2gocdmanager.8 index 3caafc6..3f2c237 100644 --- a/x2gocdmanager/man/x2gocdmanager.8 +++ b/x2gocdmanager/man/x2gocdmanager.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gocdmanager 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gocdmanager \- CD/DVD Management Daemon running on X2go Thin Clients. +x2gocdmanager \- CD/DVD Management Daemon running on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gocdmanager \- CD/DVD Management Daemon running on X2go Thin Clients. \fBx2gocdmanager\fR .SH DESCRIPTION -\fBx2gocdmanager\fR is a CD/DVD management daemon that runs on X2go thin clients. +\fBx2gocdmanager\fR is a CD/DVD management daemon that runs on X2Go thin clients. .PP .SH OPTIONS \fBx2gocdmanager\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gocdmanager/man/x2goejectcd.1 b/x2gocdmanager/man/x2goejectcd.1 index 359fbd3..660fb85 100644 --- a/x2gocdmanager/man/x2goejectcd.1 +++ b/x2gocdmanager/man/x2goejectcd.1 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2goejectcd 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2goejectcd \- CD/DVD bay eject tool for X2go Thin Clients. +x2goejectcd \- CD/DVD bay eject tool for X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2goejectcd \- CD/DVD bay eject tool for X2go Thin Clients. \fBx2goejectcd\fR .SH DESCRIPTION -\fBx2goejectcd\fR is used to eject the CD/DVD bay of optical discs built into X2go thin clients. +\fBx2goejectcd\fR is used to eject the CD/DVD bay of optical discs built into X2Go thin clients. .PP .SH OPTIONS \fBx2goejectcd\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gocdmanager/x2gocdmanager b/x2gocdmanager/x2gocdmanager old mode 100755 new mode 100644 index 1e64a31..e7894c4 --- a/x2gocdmanager/x2gocdmanager +++ b/x2gocdmanager/x2gocdmanager @@ -1,14 +1,14 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2007-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/x2gosmartcardrules/man/x2gognupgccid.8 b/x2gosmartcardrules/man/x2gognupgccid.8 index 881b811..9ca2c70 100644 --- a/x2gosmartcardrules/man/x2gognupgccid.8 +++ b/x2gosmartcardrules/man/x2gognupgccid.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gognupgccid 8 "16 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gognupgccid \- udev Script handling GnuPG smart card readers on X2go Thin Clients. +x2gognupgccid \- udev Script handling GnuPG smart card readers on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gognupgccid \- udev Script handling GnuPG smart card readers on X2go Thin Clie x2gognupgccid .SH DESCRIPTION -\fBx2gognupgccid\fR is a udev script that handles the usage of GnuPG smart card readers that are connected to X2go Thin Clients. +\fBx2gognupgccid\fR is a udev script that handles the usage of GnuPG smart card readers that are connected to X2Go Thin Clients. .PP .SH OPTIONS \fBx2gognupgccid\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gosmartcardrules/x2gognupgccid b/x2gosmartcardrules/x2gognupgccid old mode 100755 new mode 100644 diff --git a/x2gothinclient/man/x2gothinclientd.8 b/x2gothinclient/man/x2gothinclientd.8 index 2003f80..fbb510e 100644 --- a/x2gothinclient/man/x2gothinclientd.8 +++ b/x2gothinclient/man/x2gothinclientd.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gothinclientd 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclientd \- Session Control Daemon running on X2go Thin Clients. +x2gothinclientd \- Session Control Daemon running on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gothinclientd \- Session Control Daemon running on X2go Thin Clients. \fBx2gothinclientd\fR .SH DESCRIPTION -\fBx2gothinclientd\fR is a session control daemon that runs on X2go thin clients. +\fBx2gothinclientd\fR is a session control daemon that runs on X2Go thin clients. .PP .SH OPTIONS \fBx2gothinclientd\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclient/sbin/x2gothinclientd b/x2gothinclient/sbin/x2gothinclientd old mode 100755 new mode 100644 index 9efdb7d..2166ed6 --- a/x2gothinclient/sbin/x2gothinclientd +++ b/x2gothinclient/sbin/x2gothinclientd @@ -1,14 +1,14 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2007-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index 4ed1521..2163e62 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -1,14 +1,14 @@ -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -18,22 +18,22 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -# base path for X2go thin client files +# base path for X2Go thin client files TC_BASE="/opt/x2gothinclient" -# path to X2go thin client chroot +# path to X2Go thin client chroot TC_CHROOT="$TC_BASE/chroot" -# path to the X2go thin client configuration +# path to the X2Go thin client configuration TC_CONFIG="$TC_BASE/etc" -# shell to use when maintaining X2go thin client chroot manually +# shell to use when maintaining X2Go thin client chroot manually TC_SHELL="bash" # Debian package mirror to use... TC_DEBMIRROR_URL="http://ftp.debian.org/debian" -# Retrieve X2go packages from this URL +# Retrieve X2Go packages from this URL 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) @@ -44,7 +44,7 @@ TC_HTTP_PROXY="" TC_HTTPS_PROXY="" TC_FTP_PROXY="" -# module blacklist (used during X2go TCE creation) +# module blacklist (used during X2Go TCE creation) TC_MODULE_BLACKLIST="pcspkr" # tftp boot environment (PXE/syslinux files delivered via tftpd) @@ -53,7 +53,7 @@ TC_TFTP_BOOT="/srv/tftp" echo echo "X2go Thin Client Environment:" echo "=============================" -echo "The X2go Thin Client Environment is using the following" +echo "The X2Go Thin Client Environment is using the following" echo "settings:" echo echo "TC_BASE=$TC_BASE" diff --git a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 index 47ae00c..5ca98ed 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_cleanup.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gothinclient_cleanup 8 "15 June 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclient_cleanup \- Removes the X2go Thin Client environment from the X2go PXE server. +x2gothinclient_cleanup \- Removes the X2Go Thin Client environment from the X2Go PXE server. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2gothinclient_cleanup \- Removes the X2go Thin Client environment from the X2go \fBx2gothinclient_cleanup\fR .SH DESCRIPTION -This helper script removes the complete X2go TCE from your system. The script will +This helper script removes the complete X2Go TCE from your system. The script will ask you to confirm the removal action. Use with care!!! @@ -29,5 +29,5 @@ Use with care!!! .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclientmanagement/man/x2gothinclient_create.8 b/x2gothinclientmanagement/man/x2gothinclient_create.8 index da8cb54..b83dd0d 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_create.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_create.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gothinclient_create 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclient_create \- Creates X2go Thin Client chroot Environment. +x2gothinclient_create \- Creates X2Go Thin Client chroot Environment. .SH SYNOPSIS 'nh .fi @@ -15,10 +15,10 @@ x2gothinclient_create \- Creates X2go Thin Client chroot Environment. \fBx2gothinclient_create\fR .SH DESCRIPTION -This helper script creates a bootable X2go thin client system in a chroot environment. +This helper script creates a bootable X2Go thin client system in a chroot environment. .PP \fBNOTE:\fR Use this script for -building your own X2go TCE. Run this script on your X2go TCE PXE/Etherboot server (as in your DHCP +building your own X2Go TCE. Run this script on your X2Go TCE PXE/Etherboot server (as in your DHCP server's ''next-server'' option). .PP We highly recommend using a separate server (or virtual machine) for providing chroot environments. @@ -31,5 +31,5 @@ We highly recommend using a separate server (or virtual machine) for providing c Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 index 44b8e3f..3a33d5f 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_preptftpboot.8 @@ -7,7 +7,7 @@ .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. +x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered via tftpd) on X2Go PXE Server. .SH SYNOPSIS 'nh .fi @@ -15,8 +15,8 @@ x2gothinclient_preptftpboot \- Prepare PXE/Syslinux Boot Environment (delivered \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 +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. .PP Please run the \fBx2gothinclient_create\fR helper script first before you run this script. @@ -33,7 +33,7 @@ obtained from \fI/etc/x2go/x2gothinclient_settings\fR. next-server <IP-or-hostname-of-this-server>; filename '/pxelinux.0'; .PP - 2. Export the X2go Thin Client chroot environment via NFSv3: + 2. Export the X2Go Thin Client chroot environment via NFSv3: .PP Add this line to /etc/exports... (in one line): .PP @@ -60,5 +60,5 @@ obtained from \fI/etc/x2go/x2gothinclient_settings\fR. Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclientmanagement/man/x2gothinclient_shell.8 b/x2gothinclientmanagement/man/x2gothinclient_shell.8 index 0910bd9..cd2c201 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_shell.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_shell.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gothinclient_shell 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclient_shell \- Opens a shell within the X2go Thin Client chroot Environment. +x2gothinclient_shell \- Opens a shell within the X2Go Thin Client chroot Environment. .SH SYNOPSIS 'nh .fi @@ -15,9 +15,9 @@ x2gothinclient_shell \- Opens a shell within the X2go Thin Client chroot Environ \fBx2gothinclient_shell\fR .SH DESCRIPTION -This helper script opens a shell within the X2go thin client chroot environment. +This helper script opens a shell within the X2Go thin client chroot environment. .PP -\fBNOTE:\fR Use this script to perform maintenance work within your X2go thin client chroot. +\fBNOTE:\fR Use this script to perform maintenance work within your X2Go thin client chroot. .PP .SH OPTIONS \fBx2gothinclient_shell\fR has no known options. @@ -27,5 +27,5 @@ This helper script opens a shell within the X2go thin client chroot environment. Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclientmanagement/man/x2gothinclient_update.8 b/x2gothinclientmanagement/man/x2gothinclient_update.8 index 234befb..5a754fc 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_update.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_update.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gothinclient_update 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclient_update \- Updates the X2go Thin Client configuration. +x2gothinclient_update \- Updates the X2Go Thin Client configuration. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2gothinclient_update \- Updates the X2go Thin Client configuration. \fBx2gothinclient_update\fR .SH DESCRIPTION -This helper script updates the configuration of an X2go thin client chroot environment (x2goclient startup, non-LDAP session profiles). +This helper script updates the configuration of an X2Go thin client chroot environment (x2goclient startup, non-LDAP session profiles). .PP .SH OPTIONS \fBx2gothinclient_update\fR has no known options. @@ -25,7 +25,7 @@ This helper script updates the configuration of an X2go thin client chroot envir Configuration file for x2gothinclient_* scripts. /usr/share/x2go/tce/x2gothinclient_init - Script that prepares tmpfs filespace on X2go thin client startup. + Script that prepares tmpfs filespace on X2Go thin client startup. /usr/share/x2go/tce/x2gothinclient_start Script that launches and configures x2goclient in desktop manager @@ -35,5 +35,5 @@ This helper script updates the configuration of an X2go thin client chroot envir Session profiles for x2goclient if running in non-LDAP mode. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 index ce7f42d..8ac702e 100644 --- a/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 +++ b/x2gothinclientmanagement/man/x2gothinclient_upgrade.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gothinclient_upgrade 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gothinclient_upgrade \- Upgrade the X2go Thin Client's software. +x2gothinclient_upgrade \- Upgrade the X2Go Thin Client's software. .SH SYNOPSIS 'nh .fi @@ -15,7 +15,7 @@ x2gothinclient_upgrade \- Upgrade the X2go Thin Client's software. \fBx2gothinclient_upgrade\fR .SH DESCRIPTION -This helper script performs a package upgrade within the X2go thin client chroot. Use this script to update/upgrade your +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. .PP .SH OPTIONS @@ -26,5 +26,5 @@ X2go thin client's software. Configuration file for x2gothinclient_* scripts. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup old mode 100755 new mode 100644 index 566db5e..ec838e7 --- a/x2gothinclientmanagement/sbin/x2gothinclient_cleanup +++ b/x2gothinclientmanagement/sbin/x2gothinclient_cleanup @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -38,14 +38,14 @@ TC_CONFIG="${TC_CONFIG:-$TC_BASE/etc}" 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." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } echo "X2go TCE cleanup..." echo "-------------------" -echo "Hit <RETURN> to purge all X2go TCE related files (chroot, TCE config, PXE boot env)..." +echo "Hit <RETURN> to purge all X2Go TCE related files (chroot, TCE config, PXE boot env)..." echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -54,13 +54,13 @@ test -e "$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..." + 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..." + echo "WARNING: X2Go Thin Client config does not exist at $TC_CONFIG. No cleanup necessary..." } ### PXE/Syslinux @@ -68,7 +68,7 @@ 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..." + echo "WARNING: X2Go PXE/Syslinux boot environment does not exist at $TC_TFTP_BOOT. No cleanup necessary..." } echo diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create old mode 100755 new mode 100644 index c5bf7e7..63b03e0 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -43,17 +43,17 @@ TC_X2GO_DEBURL="${TC_X2GO_DEBURL:-'deb http://packages.x2go.org stable main'}" TC_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}" test -e "$TC_CHROOT" && { - echo "ERROR: X2go Thin Client chroot already exists at $TC_CHROOT." + echo "ERROR: X2Go Thin Client chroot already exists at $TC_CHROOT." echo "Clear $TC_BASE/ and then run $(basename $0) again..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } -echo "Hit <RETURN> to continue with X2go TCE chroot creation using the above TCE parameters..." +echo "Hit <RETURN> to continue with X2Go TCE chroot creation using the above TCE parameters..." echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -92,6 +92,7 @@ none /media tmpfs size=50M 0 0 none /var/lib/nfs tmpfs size=50M 0 0 none /var/lib/xkb tmpfs size=50M 0 0 none /var/lib/dbus tmpfs size=50M 0 0 +none /var/lib/alsa tmpfs size=50M 0 0 EOF @@ -135,11 +136,11 @@ chmod +x /sbin/start-stop-daemon [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules -[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2go Thin Clients..." >> /etc/modprobe.d/blacklist.conf +[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf [ \$? -eq 0 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist \$mod" >> /etc/modprobe.d/blacklist.conf; done # Pulsaudio must come afterwards until the thinclient-package is fixed -[ \$? -eq 0 ] && apt-get install pulseaudio -y +[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y [ \$? -eq 0 ] && apt-get install patch -y [ \$? -eq 0 ] && patch /etc/initramfs-tools/initramfs.conf <<PATCH 39c39 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot old mode 100755 new mode 100644 index 5b64d70..c933c1d --- a/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot +++ b/x2gothinclientmanagement/sbin/x2gothinclient_preptftpboot @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -49,19 +49,19 @@ test -e "$TC_TFTP_BOOT/pxelinux.cfg" && { } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + 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 "Preparing PXE boot configuration for X2Go TCE..." echo "------------------------------------------------" echo -echo "Copying X2go's TFTP (syslinux) template files..." +echo "Copying X2Go's TFTP (syslinux) template files..." cp -av "$TC_TFTP_FILES"/* "$TC_TFTP_BOOT" echo -echo "Linking files for X2go's TFTP (syslinux) boot environment..." +echo "Linking files for X2Go's TFTP (syslinux) boot environment..." cd "$TC_TFTP_BOOT" # 486 kernel image @@ -79,7 +79,7 @@ ln -sfv "/usr/lib/syslinux/vesamenu.c32" "$TC_TFTP_BOOT/vesamenu.c32" cd - > /dev/null echo -echo "DONE with X2go PXE/Syslinux environment setup." +echo "DONE with X2Go PXE/Syslinux environment setup." echo "However, 2-3 manual steps are still needed..." echo @@ -88,7 +88,7 @@ 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 "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,no_subtree_check)" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_shell b/x2gothinclientmanagement/sbin/x2gothinclient_shell old mode 100755 new mode 100644 index 2712320..4b8b938 --- a/x2gothinclientmanagement/sbin/x2gothinclient_shell +++ b/x2gothinclientmanagement/sbin/x2gothinclient_shell @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -32,17 +32,17 @@ fi source $ETCDIR/x2gothinclient_settings -TC_SHELL="${TC_SHELL:-/bin/bash}" +TC_SHELL="${TC_SHELL:-bash}" TC_CHROOT="${TC_CHROOT:-/opt/x2gothinclient}" test -e "$TC_CHROOT" || { - echo "ERROR: X2go Thin Client chroot does not exist at $TC_CHROOT." + echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT." echo "Run x2gothinclient_create to create it..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } @@ -57,14 +57,14 @@ 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.' -echo 'All changes performed here will take effect on your X2go Thin Clients' +echo 'This shell has been started in your X2Go Thin Clients chroot environment.' +echo 'All changes performed here will take effect on your X2Go Thin Clients' echo 'after their next (re)boot. So be careful!!!' echo echo "To return from this chroot shell hit STRG+D or type ,,exit'' on the" echo 'command line...' echo -echo 'Note: Service restarts have been disabled in X2go TCE chroot.' +echo 'Note: Service restarts have been disabled in X2Go TCE chroot.' echo # disable service restarts diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_update b/x2gothinclientmanagement/sbin/x2gothinclient_update old mode 100755 new mode 100644 index 9c0d9f7..b6d80bf --- a/x2gothinclientmanagement/sbin/x2gothinclient_update +++ b/x2gothinclientmanagement/sbin/x2gothinclient_update @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -37,24 +37,24 @@ 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." + echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT." echo "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..." + echo "ERROR: No X2Go Thin Client configuration found at $TC_CONFIG. Please check..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + 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..." +echo "Installing X2Go TCE configuration into chroot environment..." echo "------------------------------------------------------------" cp -v "$TC_CONFIG/x2gothinclient_init" "$TC_CHROOT/etc/x2go/x2gothinclient_init" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade old mode 100755 new mode 100644 index 2d01390..3d24b9e --- a/x2gothinclientmanagement/sbin/x2gothinclient_upgrade +++ b/x2gothinclientmanagement/sbin/x2gothinclient_upgrade @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -35,13 +35,13 @@ 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." + echo "ERROR: X2Go Thin Client chroot does not exist at $TC_CHROOT." echo "Run x2gothinclient_create to create it..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: X2go Thin Client management scripts have to run as super-user root." + echo "ERROR: X2Go Thin Client management scripts have to run as super-user root." exit -2 } diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg index 367b76e..33bac2b 100644 --- a/x2gothinclientmanagement/share/tftpboot/default.cfg +++ b/x2gothinclientmanagement/share/tftpboot/default.cfg @@ -1,11 +1,11 @@ # -# example for a main boot menu of an X2go Thin Client +# example for a main boot menu of an X2Go Thin Client # DEFAULT vesamenu.c32 PROMPT 0 MENU BACKGROUND x2go-splash.png -MENU TITLE X2go Thin Client Environment +MENU TITLE X2Go Thin Client Environment include local-boot.cfg include x2go-tce.cfg diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg index 4bec362..9d38f11 100644 --- a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg +++ b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg @@ -1,8 +1,8 @@ LABEL x2go-tce-686 - MENU LABEL X2go ^Thin Client + MENU LABEL X2Go ^Thin Client KERNEL vmlinuz.686 APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset LABEL x2go-tce-486 - MENU LABEL X2go ^Thin Client (old hardware) + MENU LABEL X2Go ^Thin Client (old hardware) KERNEL vmlinuz.486 APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset diff --git a/x2gothinclientmanagement/share/x2gothinclient_init b/x2gothinclientmanagement/share/x2gothinclient_init old mode 100755 new mode 100644 index 22093ca..0b68f7e --- a/x2gothinclientmanagement/share/x2gothinclient_init +++ b/x2gothinclientmanagement/share/x2gothinclient_init @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. diff --git a/x2gothinclientmanagement/share/x2gothinclient_sessions b/x2gothinclientmanagement/share/x2gothinclient_sessions index a294e0e..509bc9d 100644 --- a/x2gothinclientmanagement/share/x2gothinclient_sessions +++ b/x2gothinclientmanagement/share/x2gothinclient_sessions @@ -27,7 +27,7 @@ startsoundsystem = false icon = sound = true rootless = false -name = X2go.EXAMPLE +name = X2Go.EXAMPLE iconvto = UTF-8 rdpserver = useexports = true diff --git a/x2gothinclientmanagement/share/x2gothinclient_start b/x2gothinclientmanagement/share/x2gothinclient_start old mode 100755 new mode 100644 index 68c4a05..ae55df6 --- a/x2gothinclientmanagement/share/x2gothinclient_start +++ b/x2gothinclientmanagement/share/x2gothinclient_start @@ -1,16 +1,16 @@ #!/bin/bash -# Copyright (C) 2010-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2010-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> # Moritz 'Morty' Struebe <Moritz.Struebe@informatik.uni-erlangen.de> # Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -29,6 +29,7 @@ --geometry=fullscreen \ --read-exports-from=/home/x2goclient/export \ --no-session-edit \ + --session=X2Go.Example \ --add-to-known-hosts & # for use with LDAP on Skolelinux network diff --git a/x2gothinshutdown/man/thinshutdown.1 b/x2gothinshutdown/man/thinshutdown.1 index de03574..9cacd85 100644 --- a/x2gothinshutdown/man/thinshutdown.1 +++ b/x2gothinshutdown/man/thinshutdown.1 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH thinshutdown 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -thinshutdown \- Shutdown tool for X2go Thin Clients. +thinshutdown \- Shutdown tool for X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ thinshutdown \- Shutdown tool for X2go Thin Clients. \fBthinshutdown\fR .SH DESCRIPTION -\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2go thin clients. +\fBthinshutdown\fR is a tool that allows session-controlled shutdown of X2Go thin clients. .PP .SH OPTIONS \fBthinshutdown\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gousbmount/man/x2gousbmount.8 b/x2gousbmount/man/x2gousbmount.8 index c4b636f..4f91e0b 100644 --- a/x2gousbmount/man/x2gousbmount.8 +++ b/x2gousbmount/man/x2gousbmount.8 @@ -7,7 +7,7 @@ .if \n(.g .mso www.tmac .TH x2gousbmount 8 "02 May 2011" "Version <UNRELEASED>" "X2go Thin Client Environment" .SH NAME -x2gousbmount \- udev Script handling USB Flash Drives on X2go Thin Clients. +x2gousbmount \- udev Script handling USB Flash Drives on X2Go Thin Clients. .SH SYNOPSIS 'nh .fi @@ -15,11 +15,11 @@ x2gousbmount \- udev Script handling USB Flash Drives on X2go Thin Clients. \fBx2gousbmount\fR .SH DESCRIPTION -\fBx2gousbmount\fR is a udev script that handles plugging of USB flash drives into X2go thin clients. +\fBx2gousbmount\fR is a udev script that handles plugging of USB flash drives into X2Go thin clients. .PP .SH OPTIONS \fBx2gousbmount\fR has no known options. .PP .SH AUTHOR -This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2go project +This manual has been written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> for the X2Go project (http://www.x2go.org). diff --git a/x2gousbmount/x2gousbmount b/x2gousbmount/x2gousbmount old mode 100755 new mode 100644 index b912027..bb8a826 --- a/x2gousbmount/x2gousbmount +++ b/x2gousbmount/x2gousbmount @@ -1,14 +1,14 @@ #!/usr/bin/perl -# Copyright (C) 2007-2011 by X2go project, http://wiki.x2go.org +# Copyright (C) 2007-2011 by X2Go project, http://wiki.x2go.org # Oleksandr Shneyder <oleksandr.shneyder@obviously-nice.de> -# X2go is free software; you can redistribute it and/or modify +# X2Go is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# X2go is distributed in the hope that it will be useful, +# X2Go is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. 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).