[X2go-Commits] x2gothinclient.git - tmpfs (branch) updated: 07c6664caf6078dee45a4f2afd5fdcfea09b4e74

[X2go dev team]

The branch, tmpfs has been updated
       via  07c6664caf6078dee45a4f2afd5fdcfea09b4e74 (commit)
       via  be09152b2a9e65414fa35984b5394c4efaefade8 (commit)
      from  b2d04cc362bb21d6f45133514730d0e7d1fd10ad (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 07c6664caf6078dee45a4f2afd5fdcfea09b4e74
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 16 13:49:35 2011 +0200

    quote fix

commit be09152b2a9e65414fa35984b5394c4efaefade8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jun 16 13:48:54 2011 +0200

    Add comment that names possible boot profiles to tftp config template.

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

Summary of changes:
 debian/changelog                                   |    1 +
 x2gothinclientmanagement/bin/x2gothinclient_shell  |    2 +-
 .../share/tftpboot/default.cfg                     |    4 ++++
 3 files changed, 6 insertions(+), 1 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 32dc47b..ffee10c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ x2gothinclient (1.0.1.3-0~x2go1) UNRELEASED; urgency=low
   * Run x2gothinclient_init from x2gothinclientd init script.
   * Fix udev rules path in x2gosmartcardrules, improval of udev script, plus man page.
   * Fix udev rules path in x2gousbmount.
+  * Add comment that names possible boot profiles to tftp config template.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sat, 28 May 2011 12:04:34 +0200
 
diff --git a/x2gothinclientmanagement/bin/x2gothinclient_shell b/x2gothinclientmanagement/bin/x2gothinclient_shell
index 5e69a8f..e1a8245 100755
--- a/x2gothinclientmanagement/bin/x2gothinclient_shell
+++ b/x2gothinclientmanagement/bin/x2gothinclient_shell
@@ -59,7 +59,7 @@ export ftp_proxy=$TC_FTP_PROXY
 echo 'This shell has been started in your X2go Thin Clients chroot environment. All changes performed here'
 echo 'will take effect on your X2go Thin Clients after their next (re)boot. So be careful!!!'
 echo
-echo 'To return from this chroot shell hit STRG+D or type ,,exit'' on the command line...'
+echo 'To return from this chroot shell hit STRG+D or type ,,exit\'\' on the command line...'
 echo
 
 /bin/$TC_SHELL
diff --git a/x2gothinclientmanagement/share/tftpboot/default.cfg b/x2gothinclientmanagement/share/tftpboot/default.cfg
index 5a0d432..367b76e 100644
--- a/x2gothinclientmanagement/share/tftpboot/default.cfg
+++ b/x2gothinclientmanagement/share/tftpboot/default.cfg
@@ -21,6 +21,10 @@ MENU TABMSGROW 13
 MENU CMDLINEROW 14
 MENU ENDROW 12
 MENU TIMEOUTROW 15
+
+# possible boot profiles for ONTIMEOUT: 
+# localboot, x2go-tce-686, x2go-tce-486
+# (... or any other profile you defined in your customized menu)
 ONTIMEOUT localboot
 TIMEOUT 100
 


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