[X2go-Commits] x2gothinclient.git - master (branch) updated: 940ac2f46b3542afce98981209364860e9b0e47d

[X2go dev team]

The branch, master has been updated
       via  940ac2f46b3542afce98981209364860e9b0e47d (commit)
      from  c6a592e5b42a72e76f30c9d48005ee3cad0e676f (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 940ac2f46b3542afce98981209364860e9b0e47d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Jun 29 15:00:32 2011 +0200

    Boot TCE kernel with nomodeset boot option to avoid gCard incompatibilities (Fb vs. Xorg).

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

Summary of changes:
 debian/changelog                                   |    2 ++
 .../share/tftpboot/x2go-tce.cfg                    |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fd63e63..7a854c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * More variable ($) escaping in x2gothinclient_* scripts. Fixes start-stop-daemon
     enable/disable code.
   * Reduce x2goclient CPU load from ~100% to ~0-1%.
+  * Boot TCE kernel with nomodeset boot option to avoid gCard incompatibilities
+    (Fb vs. Xorg). 
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg
index fce038d..4bec362 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
         KERNEL vmlinuz.686
-        APPEND initrd=initrd.img.686 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet
+        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)
         KERNEL vmlinuz.486
-        APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet
+        APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset


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