[26337] in Source-Commits
/svn/athena r25526 - in trunk/debathena/debathena/kiosk: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Tue May 29 21:21:31 2012
Date: Tue, 29 May 2012 21:21:30 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205300121.q4U1LUeb012041@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-29 21:21:30 -0400 (Tue, 29 May 2012)
New Revision: 25526
Modified:
trunk/debathena/debathena/kiosk/debian/changelog
trunk/debathena/debathena/kiosk/xinitrc
Log:
In kiosk:
* Terminate kiosk sessions after 15 minutes. Patch from Luke Faraone
Modified: trunk/debathena/debathena/kiosk/debian/changelog
===================================================================
--- trunk/debathena/debathena/kiosk/debian/changelog 2012-05-30 01:20:09 UTC (rev 25525)
+++ trunk/debathena/debathena/kiosk/debian/changelog 2012-05-30 01:21:30 UTC (rev 25526)
@@ -1,3 +1,9 @@
+debathena-kiosk (1.4.5) UNRELEASED; urgency=low
+
+ * Terminate kiosk sessions after 15 minutes. Patch from Luke Faraone
+
+ -- Jonathan Reed <jdreed@mit.edu> Tue, 29 May 2012 21:21:22 -0400
+
debathena-kiosk (1.4.4) unstable; urgency=low
* Support FF 6
Modified: trunk/debathena/debathena/kiosk/xinitrc
===================================================================
--- trunk/debathena/debathena/kiosk/xinitrc 2012-05-30 01:20:09 UTC (rev 25525)
+++ trunk/debathena/debathena/kiosk/xinitrc 2012-05-30 01:21:30 UTC (rev 25526)
@@ -68,7 +68,12 @@
cp "$chrome" "$profdir/chrome/userChrome.css" || exit 1
# Launch firefox.
-firefox
+if [ "$(machtype -q)" = "quickstation" ] && [ -x /usr/bin/bugme ]; then
+ bugme --debug --fatal firefox
+else
+ firefox
+fi
+
# Clean up.
rm -rf .mozilla
