[23900] in Source-Commits
/svn/athena r23510 - trunk/debathena/config/cluster-login-config/debian
daemon@ATHENA.MIT.EDU (Robert A Basch)
Mon Mar 2 17:08:22 2009
Date: Mon, 2 Mar 2009 17:07:33 -0500
From: Robert A Basch <rbasch@MIT.EDU>
Message-Id: <200903022207.n22M7XPa029589@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: rbasch
Date: 2009-03-02 17:07:33 -0500 (Mon, 02 Mar 2009)
New Revision: 23510
Modified:
trunk/debathena/config/cluster-login-config/debian/changelog
trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst
Log:
In cluster-login-config:
* Make our gconf settings mandatory, not defaults.
* Set /apps/gnome-screensaver/embedded_keyboard_command to the
same value as logout_command, to work around a gnome-screensaver
bug (http://bugzilla.gnome.org/show_bug.cgi?id=573495).
Modified: trunk/debathena/config/cluster-login-config/debian/changelog
===================================================================
--- trunk/debathena/config/cluster-login-config/debian/changelog 2009-03-02 21:01:51 UTC (rev 23509)
+++ trunk/debathena/config/cluster-login-config/debian/changelog 2009-03-02 22:07:33 UTC (rev 23510)
@@ -1,3 +1,12 @@
+debathena-cluster-login-config (1.4) unstable; urgency=low
+
+ * Make our gconf settings mandatory, not defaults.
+ * Set /apps/gnome-screensaver/embedded_keyboard_command to the
+ same value as logout_command, to work around a gnome-screensaver
+ bug (http://bugzilla.gnome.org/show_bug.cgi?id=573495).
+
+ -- Robert Basch <rbasch@mit.edu> Mon, 02 Mar 2009 15:59:59 -0500
+
debathena-cluster-login-config (1.3) unstable; urgency=low
* Set FlexibleXServers=0 in the gdm configuration, to disable
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-02 21:01:51 UTC (rev 23509)
+++ trunk/debathena/config/cluster-login-config/debian/debathena-cluster-login-config.postinst 2009-03-02 22:07:33 UTC (rev 23510)
@@ -32,14 +32,24 @@
# Attempt to initially set the root password.
/usr/sbin/athena-root-password
- # Set up gconf defaults.
- defs=xml:readwrite:/etc/gconf/gconf.xml.defaults
- gc="gconftool-2 --direct ---config-source=$defs --set"
+ # 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
$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 \
"/usr/bin/gnome-session-save --kill --silent"
+ # KLUDGE: gnome-screensaver can overwrite its internal
+ # logout_command setting with the embedded_keyboard_command
+ # value (http://bugzilla.gnome.org/show_bug.cgi?id=573495).
+ # So work around the problem by setting the latter to the same
+ # value as the former. This should be removed after the bug
+ # has been fixed. Also disable the embedded_keyboard to ensure
+ # that this value is not used otherwise.
+ $gc -t string /apps/gnome-screensaver/embedded_keyboard_command \
+ "/usr/bin/gnome-session-save --kill --silent"
+ $gc -t bool /apps/gnome-screensaver/embedded_keyboard_enabled false
$gc -t bool /apps/gnome-screensaver/user_switch_enabled false
$gc -t bool /apps/gnome-screensaver/lock_enabled true
$gc -t int /apps/gnome-screensaver/lock_delay 1
