[X2go-Commits] x2gothinclient.git - master (branch) updated: 1.0.1.8-18-g0f565d4

[X2Go dev team]

The branch, master has been updated
       via  0f565d4614affd6bafec0949ff049cff9f34c32f (commit)
      from  a49e0b5666a43718026ac515d36ee00d1a531989 (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 0f565d4614affd6bafec0949ff049cff9f34c32f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 2 21:21:54 2012 +0200

    Disable kms for radeon and i915 graphics adapters.

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

Summary of changes:
 debian/changelog                                   |    1 +
 .../sbin/x2gothinclient_create                     |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 2a2239d..a0e4bfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low
     - Cleanly unmount --bind mounts in case there are more than one.
     - Allow thin client management (x2gothinclient_shell, x2gothinclient_upgrade)
       while thin clients are in use.
+    - Disable kms for radeon and i915 graphics adapters.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 10 Aug 2012 14:13:49 +0200
 
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 8a2aee9..97b2443 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -185,6 +185,8 @@ export X2GO_HANDLE_DAEMONS=false
 
 # tweak plymouth
 [ \$? -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/nomodeset/' -i /etc/modprobe.d/i915-kms.conf
+[ \$? -eq 0 ] && test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/nomodeset/' -i /etc/modprobe.d/radeon-kms.conf
 
 EOF
 chmod u+x $TC_CHROOT/x2go_tce_install.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).