The branch, master has been updated via 1692e917cc85ab932aed7c2069b6a24972dc0ca6 (commit) from 65d460e62294a2ee9b27dfd6f2b8abd518596833 (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 1692e917cc85ab932aed7c2069b6a24972dc0ca6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 2 22:24:09 2012 +0200 Drop i686 kernel support, use i486 kernel by default. In Debian wheezy we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. virtualbox). ----------------------------------------------------------------------- Summary of changes: debian/changelog | 3 +++ .../sbin/x2gothinclient_create | 3 --- .../share/tftpboot/x2go-tce.cfg | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4bf2668..1ed0798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,9 @@ x2gothinclient (1.0.99.1-0~x2go1) UNRELEASED; urgency=low - x2gothinclient_shell now does not affect boot behavious of the TCE machines anymore, thus, removing the notification output when launching the X2Go TCE maintenance shell. + - Drop i686 kernel support, use i486 kernel by default. In Debian wheezy + we only find a 686-pae kernel which fails on some (virtual) hardware (e.g. + virtualbox). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 10 Aug 2012 14:13:49 +0200 diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index 378672b..0aa9cb8 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -157,9 +157,6 @@ export X2GO_HANDLE_DAEMONS=false [ \$? -eq 0 ] && apt-get install linux-image-486 -y [ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.486 [ \$? -eq 0 ] && mv /initrd.img /initrd.img.486 -[ \$? -eq 0 ] && apt-get install linux-image-686 -y -[ \$? -eq 0 ] && mv /vmlinuz /vmlinuz.686 -[ \$? -eq 0 ] && mv /initrd.img /initrd.img.686 [ \$? -eq 0 ] && apt-get install x2gothinclient x2gocdmanager x2gosmartcardrules x2gousbmount -y # blacklist kernel modules diff --git a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg index 9d38f11..c1f0b3a 100644 --- a/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg +++ b/x2gothinclientmanagement/share/tftpboot/x2go-tce.cfg @@ -1,8 +1,4 @@ -LABEL x2go-tce-686 +LABEL x2go-tce-486 MENU LABEL X2Go ^Thin Client - KERNEL vmlinuz.686 - 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 nomodeset + APPEND initrd=initrd.img.486 nfsroot=/opt/x2gothinclient/chroot boot=nfs ro quiet nomodeset splash 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).