[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.1.0.0-13-g47304ba
X2Go dev team
git-admin at x2go.org
Mon Oct 28 10:45:43 CET 2013
The branch, master has been updated
via 47304ba48c9bad3c83fb103d9cb83b28d5e4ddba (commit)
from 333ea451e7ef5da3d610431cb0880604b6dac582 (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 47304ba48c9bad3c83fb103d9cb83b28d5e4ddba
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Oct 28 10:45:09 2013 +0100
Install TCE dependencies via (new) meta-package x2gothinclient-chroot.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 3 +
debian/control | 78 +++++++++++++-------
.../sbin/x2gothinclient_create | 11 +--
3 files changed, 58 insertions(+), 34 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e4b367d..4120407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
- Remove chroot bootstrap cruft when finished with creating the
TCE chroot.
- Deactivate serial line terminals on X2Go thinclients.
+ - Install TCE dependencies via meta-package x2gothinclient-chroot.
+ * debian/control:
+ + New bin:package x2gothinclient-chroot.
[ Arnold Krille ]
* New upstream version (1.1.0.1):
diff --git a/debian/control b/debian/control
index 968d59b..277c0b3 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Recommends:
nfs-kernel-server
Suggests:
dhcp3-server | dnsmasq | isc-dhcp-server
-Description: Management tools for X2Go thin client chroot server
+Description: Management tools for X2Go Thin Client chroot server
X2Go is a server based computing environment with
- session resuming
- low bandwidth support
@@ -40,11 +40,48 @@ 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.
+Package: x2gothinclient-chroot
+Architecture: all
+Depends:
+ ${misc:Depends},
+ alsa-base,
+ nfs-common,
+ patch,
+ plymouth,
+ plymouth-themes-all,
+ pulseaudio-x11 | pulseaudio,
+ syslinux,
+ x2gothinclient,
+Recommends:
+ acpid,
+ gnupg-agent,
+ pinentry-x2go,
+ gpgsm,
+ memtest86+,
+ x11-xserver-utils,
+ x2gocdmanager,
+ x2gousbmount,
+ x2gosmartcardrules,
+Description: Install X2Go Thin Client chroot (meta-package)
+ X2Go is a server based computing environment with
+ - session resuming
+ - low bandwidth support
+ - session broker support
+ - client-side mass storage mounting support
+ - client-side printing support
+ - audio support
+ - authentication by smartcard and USB stick
+ .
+ x2gothinclient-chroot:
+ ----------------------
+ This meta-package installs all X2Go TCE dependencies. This
+ package is used in the X2Go Thin Client's chroot.
+
Package: x2gothinclient
Architecture: all
Depends:
@@ -55,20 +92,9 @@ Depends:
xauth,
xinit,
locales,
- pulseaudio-x11 | pulseaudio,
dbus-x11,
policykit-1,
-Recommends:
- x2gocdmanager,
- x2gousbmount,
- x2gosmartcardrules,
- gnupg-agent,
- pinentry-x2go,
- gpgsm,
- x11-xserver-utils,
Suggests:
- plymouth,
- plymouth-themes-all
Breaks:
x2gothinshutdown
Replaces:
@@ -85,15 +111,17 @@ 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
- x2goclient functionality.
+ This package starts X2Go Client in fullscreen mode---without window
+ decorations, without menu and toolbar and optionally with enabled
+ session broker support.
+ .
+ This package ships the core X2Go Thin Client daemon that guards over
+ X2Go Client functionality.
.
- x2goclient will behave like xdm, kdm or gdm on X2Go thin clients.
+ X2Go Client in thin-client-mode will behave like xdm, kdm or gdm.
Package: x2gousbmount
Architecture: all
@@ -114,11 +142,11 @@ Description: clientside usb mass-storage device mounting
.
x2gousbmount:
-------------
- 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 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
@@ -141,11 +169,11 @@ Description: clientside daemon enabling automatic CD-Rom mounting
.
x2gocdmanager:
--------------
- 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 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: x2gosmartcardrules
Architecture: all
@@ -164,7 +192,7 @@ Description: UDEV rules for smartcard readers
.
x2gosmartcardrules:
-------------------
- 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 provides UDEV rules for smartcard readers (devices that
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 3fb8eff..61854e7 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -170,7 +170,7 @@ export X2GO_HANDLE_DAEMONS=false
[ \$? -eq 0 ] && apt-get update
[ \$? -eq 0 ] && apt-get install $TC_SHELL -y
-[ \$? -eq 0 ] && apt-get install syslinux locales -y
+[ \$? -eq 0 ] && apt-get install locales -y
if [ \$? -eq 0 -a "x${TC_NONINTERACTIVE}" != "x" ]; then
dpkg-reconfigure locales
fi
@@ -180,13 +180,7 @@ fi
[ \$? -eq 0 ] && test -h /initrd.img && mv /initrd.img /initrd.img.486.tmp || true
[ \$? -eq 0 ] && LINK_TARGET=\$(readlink /initrd.img.486.tmp | sed 's@/boot at boot@') && ln -sf \$LINK_TARGET /initrd.img.486 && rm -f /initrd.img.486.tmp
-[ \$? -eq 0 ] && apt-get install alsa-base pulseaudio -y
-[ \$? -eq 0 ] && apt-get install patch -y
-
-[ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y
-
-# some extra tools that are useful on the TCE
-[ \$? -eq 0 ] && apt-get install vim mc acpid memtest86+ -y
+[ \$? -eq 0 ] && apt-get install x2gothinclient-chroot -y
# blacklist kernel modules
[ \$? -eq 0 ] && echo && echo "# modules blacklisted on X2Go Thin Clients..." >> /etc/modprobe.d/blacklist.conf
@@ -210,7 +204,6 @@ fi
[ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config
# tweak plymouth
-[ \$? -eq 0 ] && apt-get install plymouth plymouth-themes-all -y
[ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME=$TC_PRETTY_NAME/' -i /etc/os-release || echo "PRETTY_NAME=$TC_PRETTY_NAME" >> /etc/os-release
[ \$? -eq 0 ] && test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf || true
[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf || true
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).
More information about the x2go-commits
mailing list