[SCM] live-config branch, debian, updated. debian/3.0_a26-1

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit c979d742f5eb58619e0b63f2584a9db8200c2639
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 23 14:41:25 2011 +0200

    Lowering display-manager timeouts for a users automatic re-login from 10s to 5s.

diff --git a/scripts/config/006-gdm b/scripts/config/006-gdm
index cf8c75f..2d9c753 100755
--- a/scripts/config/006-gdm
+++ b/scripts/config/006-gdm
@@ -42,7 +42,7 @@ Configure_gdm ()
 AutomaticLogin=${LIVE_USERNAME}\n\
 TimedLoginEnable=true\n\
 TimedLogin=${LIVE_USERNAME}\n\
-TimedLoginDelay=10"
+TimedLoginDelay=5"
 
 	sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM_OPTIONS}|" /etc/gdm/gdm.conf
 
diff --git a/scripts/config/007-gdm3 b/scripts/config/007-gdm3
index 0e68357..6671441 100755
--- a/scripts/config/007-gdm3
+++ b/scripts/config/007-gdm3
@@ -42,7 +42,7 @@ Configure_gdm3 ()
 AutomaticLogin=${LIVE_USERNAME}\n\
 TimedLoginEnable=true\n\
 TimedLogin=${LIVE_USERNAME}\n\
-TimedLoginDelay=10"
+TimedLoginDelay=5"
 
 	sed -i -e "s|\[daemon\]|\[daemon\]\n${_GDM3_OPTIONS}|" /etc/gdm3/daemon.conf
 
diff --git a/scripts/config/009-lightdm b/scripts/config/009-lightdm
index 4846e50..719931d 100755
--- a/scripts/config/009-lightdm
+++ b/scripts/config/009-lightdm
@@ -35,7 +35,7 @@ Configure_lightdm ()
 	if [ -e /etc/lightdm/lightdm.conf ]
 	then
 		sed -i -r -e "s|^#.*autologin-user=.*\$|autologin-user=${LIVE_USERNAME}|" \
-			  -e "s|^#.*autologin-user-timeout=.*\$|autologin-user-timeout=0|" \
+			  -e "s|^#.*autologin-user-timeout=.*\$|autologin-user-timeout=5|" \
 		/etc/lightdm/lightdm.conf
 	fi
 

-- 
live-config