The branch, master has been updated via 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 (commit) from db502cbfd190e2d0975e407ee16baf062c53e990 (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 37e9a55ba62ca1078ed00aa4aa2847edc77e9cc6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 14 15:10:36 2013 +0100 Tweak the /etc/os-release more comprehensively. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2gothinclient.install | 3 ++- debian/x2gothinclientmanagement.install | 1 + x2gothinclient/VERSION.x2gothinclient | 1 + .../VERSION.x2gothinclientmanagement | 1 + .../etc/x2gothinclient_settings | 3 +++ .../sbin/x2gothinclient_create | 2 +- 7 files changed, 10 insertions(+), 2 deletions(-) create mode 120000 x2gothinclient/VERSION.x2gothinclient create mode 120000 x2gothinclientmanagement/VERSION.x2gothinclientmanagement The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 7ca3a8b..99e369f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2gothinclient (1.1.0.1-0~x2go1) UNRELEASED; urgency=low init script and ALSA's utils.sh. - Refrain from using "~<user>" when launching X2Go Client as it cannot handle it, yet. Use "~" instead (handable by X2Go Client >= 4.0.1.2). + - Tweak the /etc/os-release more comprehensively. * debian/control: + New bin:package x2gothinclient-chroot. + Make sure x2gothinclient-chroot pulls in editing tools like diff --git a/debian/x2gothinclient.install b/debian/x2gothinclient.install index ee7f973..f2c48ff 100644 --- a/debian/x2gothinclient.install +++ b/debian/x2gothinclient.install @@ -1,2 +1,3 @@ x2gothinclient/sbin/x2gothinclientd usr/sbin/ -x2gothinclientmanagement/share/etc/* etc/x2go/ +x2gothinclientmanagement/share/etc/* etc/x2go/ +x2gothinclient/VERSION.x2gothinclient usr/share/x2go/versions/ diff --git a/debian/x2gothinclientmanagement.install b/debian/x2gothinclientmanagement.install index ee16044..a9077fa 100644 --- a/debian/x2gothinclientmanagement.install +++ b/debian/x2gothinclientmanagement.install @@ -2,3 +2,4 @@ x2gothinclientmanagement/sbin/x2gothinclient_* usr/sbin/ x2gothinclientmanagement/etc/x2gothinclient_* etc/x2go/ x2gothinclientmanagement/share/etc/ usr/share/x2go/tce/ x2gothinclientmanagement/share/tftpboot usr/share/x2go/tce/ +x2gothinclientmanagement/VERSION.x2gothinclientmanagement usr/share/x2go/versions/ \ No newline at end of file diff --git a/x2gothinclient/VERSION.x2gothinclient b/x2gothinclient/VERSION.x2gothinclient new file mode 120000 index 0000000..6ff19de --- /dev/null +++ b/x2gothinclient/VERSION.x2gothinclient @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/x2gothinclientmanagement/VERSION.x2gothinclientmanagement b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement new file mode 120000 index 0000000..6ff19de --- /dev/null +++ b/x2gothinclientmanagement/VERSION.x2gothinclientmanagement @@ -0,0 +1 @@ +../VERSION \ No newline at end of file diff --git a/x2gothinclientmanagement/etc/x2gothinclient_settings b/x2gothinclientmanagement/etc/x2gothinclient_settings index d7f942c..ba701c9 100644 --- a/x2gothinclientmanagement/etc/x2gothinclient_settings +++ b/x2gothinclientmanagement/etc/x2gothinclient_settings @@ -21,6 +21,9 @@ # name of this instance of the X2Go TCE (appears during thinclient boot process) TC_PRETTY_NAME="X2Go TCE" +# Adapt to your system!!! This path fits for Debian systems. Or provide the version manually. +TC_VERSION=`cat /usr/share/x2go/versions/VERSION.x2gothinclientmanagement` + # base path for X2Go thin client files TC_BASE="/opt/x2gothinclient" diff --git a/x2gothinclientmanagement/sbin/x2gothinclient_create b/x2gothinclientmanagement/sbin/x2gothinclient_create index f210edf..0f88f44 100755 --- a/x2gothinclientmanagement/sbin/x2gothinclient_create +++ b/x2gothinclientmanagement/sbin/x2gothinclient_create @@ -204,7 +204,7 @@ fi [ \$? -eq 0 ] && sed -e 's/#ListenAddress ::/AddressFamily inet\nListenAddress 127.0.0.1/' -i /etc/ssh/sshd_config # 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/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@HOME_URL=.*@HOME_URL="http://wiki.x2go.org"@' -e 's@SUPPORT_URL=.*@SUPPORT_URL="http://wiki.x2go.org/"@' -e 's@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 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).