Add gconf settings for gnome-screensaver to disable locking by default. This is...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1411 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 6094352d43c5786421f82f04afc5a70ad28e4062..8ec483caa7c0adc7f91fdbefbefa0e882c65c1a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  29 May 2008; Chris Gianelloni <wolf31o2@gentoo.org> TODO, catalyst,
+  targets/support/livecdfs-update.sh:
+  Add gconf settings for gnome-screensaver to disable locking by default. This
+  is 2.0.6 final.
+
   14 May 2008; Andrew Gaffney <agaffney@gentoo.org> arch/arm.py:
   Add armv5tel to arm host list
 

diff --git a/TODO b/TODO
index fd190f8ec2e6e6ac4afc7ceba876a5fcc2a44a1a..5ff62e6468aab285c4713946aa83fedb6a730a85 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,3 +10,4 @@
        - automatically pull stages
 - check that distcc_hosts is set before enabling distcc
 - allow setting of distcc_hosts in catalyst.conf with override in the specs
+- perform user management via a loop in livecd-stage2

diff --git a/catalyst b/catalyst
index 35dd14da516bff287163e8b15e938a6076ddf646..eb18bc3acd9b34fa53bb09d0cc7cc0af6267c971 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre17"
+__version__="2.0.6"
 
 conf_values={}
 

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 9409f06069cec9b6cce45709c0b4635a044961f4..a03335a904556357b55f595b52902ef06fd1d02c 100755 (executable)
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -270,6 +270,11 @@ case ${clst_livecd_type} in
                                --type string --set /desktop/gnome/interface/font_name "Sans 9"
                fi
 
+               # Remove locking on screensaver
+               gconftool-2 --direct \
+                       -config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s \
+                       -t bool /apps/gnome-screensaver/lock_enabled false >/dev/null
+
                # Setup GDM
                if [ "${clst_livecd_xdm}" == "gdm" ]
                then