[X2go-Commits] x2gothinclient.git - tmpfs (branch) updated: 69b1de0bd6ebd30fb92664fa44fef1e78d36d6c6

[X2go dev team]

The branch, tmpfs has been updated
       via  69b1de0bd6ebd30fb92664fa44fef1e78d36d6c6 (commit)
       via  fa5b158616c3418dc6a69a10189553bd36f284c3 (commit)
      from  16aadde9b6ab9c5c98b606a6fda17b69898fbd82 (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 69b1de0bd6ebd30fb92664fa44fef1e78d36d6c6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 16 14:04:26 2011 +0200

    fix sourcing of x2gothinclient_init file in init script

commit fa5b158616c3418dc6a69a10189553bd36f284c3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 16 14:02:24 2011 +0200

    Add kernel module blacklisting for x2gothinclient_create.

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

Summary of changes:
 debian/changelog                                   |    1 +
 debian/x2gothinclient.init                         |    2 +-
 x2gothinclientmanagement/bin/x2gothinclient_create |    5 +++++
 .../etc/x2gothinclient_settings                    |    3 +++
 4 files changed, 10 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f4b7886..884bbf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Fix udev rules path in x2gousbmount.
   * Add comment that names possible boot profiles to tftp config template.
   * Add midnight commander to Recommends: of x2gothinclient.
+  * Add kernel module blacklisting for x2gothinclient_create.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/debian/x2gothinclient.init b/debian/x2gothinclient.init
index bdaf796..9b305a5 100644
--- a/debian/x2gothinclient.init
+++ b/debian/x2gothinclient.init
@@ -39,7 +39,7 @@ 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...
-test -x /etc/x2go/x2gothinclient_init && source /etc/x2go/x2gothinclient_init
+test -x /etc/x2go/x2gothinclient_init && . /etc/x2go/x2gothinclient_init
 
 set -e
 
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_create b/x2gothinclientmanagement/bin/x2gothinclient_create
index c740899..589fdb6 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_create
+++ b/x2gothinclientmanagement/bin/x2gothinclient_create
@@ -40,6 +40,7 @@ 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_MODULE_BLACKLIST="${TC_MODULE_BLACKLIST:-'pcspkr'}"
 
 test -e "$TC_CHROOT" && { 
     echo "ERROR: X2go Thin Client chroot already exists at $TC_CHROOT. Clear $TC_BASE/ and then run $(basename $0) again..."
@@ -118,6 +119,10 @@ mkdir -p /var/lib/nfs
 [ $? -eq 0 ] && cp /initrd.img /initrd.img.686
 [ $? -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 ] && for mod in $TC_MODULE_BLACKLIST; do echo "blacklist $mod" >> /etc/modprobe.d/blacklist.conf
+
 #Pulsaudio must come afterwards until the thinclient-package is fixed
 [ $? -eq 0 ] && apt-get install pulseaudio -y
 [ $? -eq 0 ] && dpkg-reconfigure locales
diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings
index 758efcc..470d41b 100644
--- a/x2gothinclientmanagement/etc/x2gothinclient_settings
+++ b/x2gothinclientmanagement/etc/x2gothinclient_settings
@@ -44,6 +44,9 @@ TC_HTTP_PROXY=""
 TC_HTTPS_PROXY=""
 TC_FTP_PROXY=""
 
+# module blacklist (used during X2go TCE creation)
+TC_MODULE_BLACKLIST="pcspkr"
+
 # tftp boot environment (PXE/syslinux files delivered via tftpd)
 TC_TFTP_BOOT="/srv/tftp"
 


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).