[X2Go-Commits] x2gothinclient.git - master (branch) updated: 1.1.0.0-38-g4c67b84

[X2Go dev team]

The branch, master has been updated
       via  4c67b8404c0c9faa2d441035e7e03264fc1fffce (commit)
      from  8a80e5318a571fd508c993e5c2967ad9def240a3 (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 4c67b8404c0c9faa2d441035e7e03264fc1fffce
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 22 16:01:22 2013 +0100

    Install radeon and i915 kms/drm module into initrd image for Debian (>= 7).

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5e39712..af6fbf7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,8 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low
     - Add TC_NONINTERACTIVE (commented out) to x2gothinclient_settings config
       file.
     - Add syslog support to x2gousbmount.
+    - Install radeon and i915 kms/drm module into initrd image for Debian
+      (>= 7).
   * debian/control:
     + New bin:package x2gothinclient-chroot.
     + Make sure x2gothinclient-chroot pulls in editing tools like
diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create
index 82db380..1fe824b 100755
--- a/x2gothinclientmanagement/sbin/x2gothinclient_create
+++ b/x2gothinclientmanagement/sbin/x2gothinclient_create
@@ -199,9 +199,10 @@ fi
 [ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config
 
 # tweak plymouth
+[ \$? -eq 0 ] && if [ "$TC_DISTRO_CODENAME" != "squeeze" ]; then echo "radeon" >> /etc/initramfs-tools/modules; echo "i915" >> /etc/initramfs-tools/modules; fi
 [ \$? -eq 0 ] && test -e /etc/os-release && sed -e 's/PRETTY_NAME=.*/PRETTY_NAME="$TC_PRETTY_NAME"/' -e 's/NAME=.*/NAME="$TC_PRETTY_NAME"/' -e 's/VERSION=.*/VERSION="$TC_VERSION"/' -e 's/VERSION_ID=.*/VERSION_ID="$TC_VERSION"/' -e 's at HOME_URL=.*@HOME_URL="http://wiki.x2go.org"@' -e 's at SUPPORT_URL=.*@SUPPORT_URL="http://wiki.x2go.org/"@' -e 's at BUG_REPORT_URL=.*@BUG_REPORT_URL="http://bugs.x2go.org"@' -i /etc/os-release || echo -e 'PRETTY_NAME="$TC_PRETTY_NAME"\nNAME="$TC_PRETTY_NAME"\n' > /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
+[ \$? -eq 0 ] && if [ "$TC_DISTRO_CODENAME" == "squeeze" ]; then test -e /etc/modprobe.d/i915-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/i915-kms.conf; fi
+[ \$? -eq 0 ] && if [ "$TC_DISTRO_CODENAME" == "squeeze" ]; then test -e /etc/modprobe.d/radeon-kms.conf && sed -s 's/modeset=1/modeset=0/' -i /etc/modprobe.d/radeon-kms.conf; fi
 
 # no serial line TTY on thin clients
 [ \$? -eq 0 ] && sed -e 's/^T0:23:respawn:/#T0:23:respawn:/' -i /etc/inittab


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