[26394] in Source-Commits
/svn/athena r25548 - in trunk/debathena/debathena/kiosk: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Jun 1 13:27:00 2012
Date: Fri, 1 Jun 2012 13:26:59 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206011726.q51HQxUB009677@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-01 13:26:59 -0400 (Fri, 01 Jun 2012)
New Revision: 25548
Modified:
trunk/debathena/debathena/kiosk/debian/changelog
trunk/debathena/debathena/kiosk/index.html
trunk/debathena/debathena/kiosk/launch-kiosk
Log:
In kiosk:
* Add a gconf-tree.xml to prevent [redacted] (Trac: 1130)
* Tweak wording on home page.
Modified: trunk/debathena/debathena/kiosk/debian/changelog
===================================================================
--- trunk/debathena/debathena/kiosk/debian/changelog 2012-06-01 16:01:35 UTC (rev 25547)
+++ trunk/debathena/debathena/kiosk/debian/changelog 2012-06-01 17:26:59 UTC (rev 25548)
@@ -1,10 +1,12 @@
-debathena-kiosk (1.4.5) UNRELEASED; urgency=low
+debathena-kiosk (1.4.5) unstable; urgency=low
* Terminate kiosk sessions after 15 minutes. Patch from Luke Faraone
* Support Firefox through November, at which point we should give up and
switch to Chrome
+ * Add a gconf-tree.xml to prevent [redacted] (Trac: 1130)
+ * Tweak wording on home page.
- -- Jonathan Reed <jdreed@mit.edu> Tue, 29 May 2012 21:29:27 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 01 Jun 2012 13:25:54 -0400
debathena-kiosk (1.4.4) unstable; urgency=low
Modified: trunk/debathena/debathena/kiosk/index.html
===================================================================
--- trunk/debathena/debathena/kiosk/index.html 2012-06-01 16:01:35 UTC (rev 25547)
+++ trunk/debathena/debathena/kiosk/index.html 2012-06-01 17:26:59 UTC (rev 25548)
@@ -35,8 +35,11 @@
<p>
When you have completed this browser session, please exit by entering
the Control-Q key combination, or by clicking the 'X' button at the
-top right of the screen.
+top left or right corner of the screen.
</p>
+<p><strong>NOTE:</strong>This browser session will be automatically
+ terminated after 15 minutes. If you need more time, please log in to
+ a regular Athena session.</p>
</body>
</html>
Modified: trunk/debathena/debathena/kiosk/launch-kiosk
===================================================================
--- trunk/debathena/debathena/kiosk/launch-kiosk 2012-06-01 16:01:35 UTC (rev 25547)
+++ trunk/debathena/debathena/kiosk/launch-kiosk 2012-06-01 17:26:59 UTC (rev 25548)
@@ -35,6 +35,8 @@
rm -rf "$kiosk_home"
mkdir "$kiosk_home"
cp "$datadir/xinitrc" "$kiosk_home/.xinitrc"
+mkdir "$kiosk_home/.gconf"
+cp "$datadir/%gconf-tree.xml" "$kiosk_home/.gconf/"
chown -R "$kiosk_user":"$kiosk_group" "$kiosk_home"
# Launch the session on our VT, and wait for it to complete. This will
