[23984] in Source-Commits
/svn/athena r23594 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Robert A Basch)
Mon Mar 9 18:17:13 2009
X-Barracuda-Envelope-From: rbasch@mit.edu
Date: Mon, 9 Mar 2009 18:17:07 -0400
From: Robert A Basch <rbasch@MIT.EDU>
Message-Id: <200903092217.n29MH7Pu006727@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: rbasch
Date: 2009-03-09 18:17:07 -0400 (Mon, 09 Mar 2009)
New Revision: 23594
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.prerm
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:
* Unset /desktop/gnome/lockdown/disable_user_switching, so that
the fast-user-switch-applet is enabled (for logout).
* Configure fast-user-switch-applet and gnome-power-manager
settings so that FUSA offers only the lock screen, logout,
restart, and shutdown options.
* Undo our gconf settings in the prerm script.
* Re-enable HALT and REBOOT from the login screen and as logout
actions.
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2009-03-09 21:41:50 UTC (rev 23593)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2009-03-09 22:17:07 UTC (rev 23594)
@@ -1,3 +1,16 @@
+debathena-cluster-login-config (1.8) unstable; urgency=low
+
+ * Unset /desktop/gnome/lockdown/disable_user_switching, so that
+ the fast-user-switch-applet is enabled (for logout).
+ * Configure fast-user-switch-applet and gnome-power-manager
+ settings so that FUSA offers only the lock screen, logout,
+ restart, and shutdown options.
+ * Undo our gconf settings in the prerm script.
+ * Re-enable HALT and REBOOT from the login screen and as logout
+ actions.
+
+ -- Robert Basch <rbasch@mit.edu> Mon, 09 Mar 2009 17:58:09 -0400
+
debathena-cluster-login-config (1.7) unstable; urgency=low
* Allow users to sudo to anyone, primarily so they can sudo to
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2009-03-09 21:41:50 UTC (rev 23593)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2009-03-09 22:17:07 UTC (rev 23594)
@@ -35,7 +35,9 @@
# Set mandatory gconf key values.
gcsrc=xml:readwrite:/etc/gconf/gconf.xml.mandatory
gc="gconftool-2 --direct --config-source=$gcsrc --set"
- $gc -t bool /desktop/gnome/lockdown/disable_user_switching true
+ gcunset="gconftool-2 --direct --config-source=$gcsrc --unset"
+
+ # gnome-screensaver
$gc -t bool /apps/gnome-screensaver/logout_enabled true
$gc -t int /apps/gnome-screensaver/logout_delay 20
$gc -t string /apps/gnome-screensaver/logout_command \
@@ -54,6 +56,18 @@
$gc -t bool /apps/gnome-screensaver/lock_enabled true
$gc -t int /apps/gnome-screensaver/lock_delay 1
+ # fast-user-switch-applet
+ $gc -t bool /apps/fast-user-switch-applet/show_active_users_only true
+ $gc -t bool /apps/fast-user-switch-applet/show_guest_login false
+
+ # gnome-power-manager
+ $gc -t bool /apps/gnome-power-manager/general/can_hibernate false
+ $gc -t bool /apps/gnome-power-manager/general/can_suspend false
+
+ # We set this true in earlier versions, before settings were
+ # undone in the prerm script, but we want it unset now.
+ $gcunset /desktop/gnome/lockdown/disable_user_switching
+
# Set up gconf defaults.
gcsrc=xml:readwrite:/etc/gconf/gconf.xml.defaults
gc="gconftool-2 --direct --config-source=$gcsrc --set"
Modified: trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.prerm
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.prerm 2009-03-09 21:41:50 UTC (rev 23593)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.prerm 2009-03-09 22:17:07 UTC (rev 23594)
@@ -20,6 +20,27 @@
case "$1" in
remove|upgrade|deconfigure)
perl -i'' -ne 's%^### (BEGIN|END) debathena-cluster-login-config\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+
+ # Undo our mandatory gconf settings.
+ gcsrc=xml:readwrite:/etc/gconf/gconf.xml.mandatory
+ gcunset="gconftool-2 --direct --config-source=$gcsrc --unset"
+ $gcunset /apps/gnome-screensaver/logout_enabled
+ $gcunset /apps/gnome-screensaver/logout_delay
+ $gcunset /apps/gnome-screensaver/logout_command
+ $gcunset /apps/gnome-screensaver/embedded_keyboard_command
+ $gcunset /apps/gnome-screensaver/embedded_keyboard_enabled
+ $gcunset /apps/gnome-screensaver/user_switch_enabled
+ $gcunset /apps/gnome-screensaver/lock_enabled
+ $gcunset /apps/gnome-screensaver/lock_delay
+ $gcunset /apps/fast-user-switch-applet/show_active_users_only
+ $gcunset /apps/fast-user-switch-applet/show_guest_login
+ $gcunset /apps/gnome-power-manager/general/can_hibernate
+ $gcunset /apps/gnome-power-manager/general/can_suspend
+
+ # Undo our default gconf settings.
+ gcsrc=xml:readwrite:/etc/gconf/gconf.xml.defaults
+ gcunset="gconftool-2 --direct --config-source=$gcsrc --unset"
+ $gcunset /desktop/gnome/session/required_components/windowmanager
;;
failed-upgrade)
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-03-09 21:41:50 UTC (rev 23593)
+++ trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf-custom.debathena.debathena 2009-03-09 22:17:07 UTC (rev 23594)
@@ -1,5 +1,5 @@
#!/bin/sed -f
/^\[daemon\]/a\
-SystemCommandsInMenu=\
-AllowLogoutActions=\
+SystemCommandsInMenu=HALT;REBOOT\
+AllowLogoutActions=HALT;REBOOT\
FlexibleXServers=0
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-03-09 21:41:50 UTC (rev 23593)
+++ trunk/debathena/config/cluster-login-config/debian/transform_gdm.conf.debathena.debathena 2009-03-09 22:17:07 UTC (rev 23594)
@@ -1,4 +1,4 @@
#!/bin/sed -f
-s/^SystemCommandsInMenu=.*/SystemCommandsInMenu=/
-s/^AllowLogoutActions=.*/AllowLogoutActions=/
+s/^SystemCommandsInMenu=.*/SystemCommandsInMenu=HALT;REBOOT/
+s/^AllowLogoutActions=.*/AllowLogoutActions=HALT;REBOOT/
s/^#\?FlexibleXServers=.*/FlexibleXServers=0/
