[24268] in Source-Commits
/svn/athena r23866 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Robert A Basch)
Wed Jun 17 16:57:35 2009
Date: Wed, 17 Jun 2009 16:57:22 -0400
From: Robert A Basch <rbasch@MIT.EDU>
Message-Id: <200906172057.n5HKvMoC006747@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: rbasch
Date: 2009-06-17 16:57:22 -0400 (Wed, 17 Jun 2009)
New Revision: 23866
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/control.in
trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf-custom.debathena.debathena
trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf.debathena.debathena
Log:
In cluster-login-config:
* Add a gdm custom command to register for an account via the
kiosk mode browser.
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2009-06-17 20:08:30 UTC (rev 23865)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2009-06-17 20:57:22 UTC (rev 23866)
@@ -1,3 +1,10 @@
+debathena-cluster-login-config (1.12) unstable; urgency=low
+
+ * Add a gdm custom command to register for an account via the
+ kiosk mode browser.
+
+ -- Robert Basch <rbasch@mit.edu> Wed, 17 Jun 2009 15:43:13 -0400
+
debathena-cluster-login-config (1.11) unstable; urgency=low
* Disable the built-in failsafe Xterm and GNOME sessions. (Trac: #148)
Modified: trunk/debathena/config/cluster-login-config/debian/control.in
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/control.in 2009-06-17 20:08:30 UTC (rev 23865)
+++ trunk/debathena/config/cluster-login-config/debian/control.in 2009-06-17 20:57:22 UTC (rev 23866)
@@ -7,7 +7,7 @@
Package: debathena-cluster-login-config
Architecture: all
-Depends: debathena-machtype, debathena-afs-config, debathena-gdm-config, gconf2, gnome-screensaver, kexec-tools
+Depends: debathena-machtype, debathena-afs-config, debathena-gdm-config, debathena-kiosk, gconf2, gnome-screensaver, kexec-tools
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Description: Login configuration for Athena cluster machines
Modified: trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf-custom.debathena.debathena
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf-custom.debathena.debathena 2009-06-17 20:08:30 UTC (rev 23865)
+++ trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf-custom.debathena.debathena 2009-06-17 20:57:22 UTC (rev 23866)
@@ -1,8 +1,17 @@
#!/bin/sed -f
/^\[daemon\]/a\
-SystemCommandsInMenu=HALT;REBOOT\
+SystemCommandsInMenu=HALT;REBOOT;CUSTOM_CMD\
AllowLogoutActions=HALT;REBOOT\
FlexibleXServers=0
/^\[greeter\]/a\
ShowGnomeFailsafeSession=false\
ShowXtermFailsafeSession=false
+$a\
+[customcommand]\
+CustomCommand0=/usr/lib/debathena-kiosk/launch-kiosk\
+CustomCommandText0=Click OK to launch a restricted web browser. This can be used to register for an Athena account. Click Cancel to login to a standard Athena session.\
+CustomCommandLabel0=Register for an _Account\
+CustomCommandLRLabel0=Register for an _Account\
+CustomCommandTooltip0=Register for an Account\
+CustomCommandIsPersistent0=false\
+CustomCommandNoRestart0=true
Modified: trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf.debathena.debathena
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf.debathena.debathena 2009-06-17 20:08:30 UTC (rev 23865)
+++ trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf.debathena.debathena 2009-06-17 20:57:22 UTC (rev 23866)
@@ -1,6 +1,13 @@
#!/bin/sed -f
-s/^SystemCommandsInMenu=.*/SystemCommandsInMenu=HALT;REBOOT/
+s/^SystemCommandsInMenu=.*/SystemCommandsInMenu=HALT;REBOOT;CUSTOM_CMD/
s/^AllowLogoutActions=.*/AllowLogoutActions=HALT;REBOOT/
s/^#\?FlexibleXServers=.*/FlexibleXServers=0/
s/^#\?ShowGnomeFailsafeSession=.*/ShowGnomeFailsafeSession=false/
s/^#\?ShowXtermFailsafeSession=.*/ShowXtermFailsafeSession=false/
+s|^#\?CustomCommand0=.*|CustomCommand0=/usr/lib/debathena-kiosk/launch-kiosk|
+s/^#\?CustomCommandText0=.*/CustomCommandText0=Click OK to launch a restricted web browser. This can be used to register for an Athena account. Click Cancel to login to a standard Athena session./
+s/^#\?CustomCommandLabel0=.*/CustomCommandLabel0=Register for an _Account/
+s/^#\?CustomCommandLRLabel0=.*/CustomCommandLRLabel0=Register for an _Account/
+s/^#\?CustomCommandTooltip0=.*/CustomCommandTooltip0=Register for an Account/
+s/^#\?CustomCommandIsPersistent0=.*/CustomCommandIsPersistent0=false/
+s/^#\?CustomCommandNoRestart0=.*/CustomCommandNoRestart0=true/
