[SCM] live-config branch, debian, updated. debian/3.0_a24-1-5-ge98ab01

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit cf23f9f306d9ed1bf8d83033279a42faa9cbe485
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Aug 22 15:58:21 2011 +0200

    Using broader sed patterns for autologin configuration in display-manager configurations.

diff --git a/scripts/config/008-kdm b/scripts/config/008-kdm
index ccc9ea1..6c20966 100755
--- a/scripts/config/008-kdm
+++ b/scripts/config/008-kdm
@@ -38,15 +38,15 @@ Configure_kdm ()
 	fi
 
 	# autologin
-	sed -i -r -e "s|^#?AutoLoginEnable=.*\$|AutoLoginEnable=true|" \
-		  -e "s|^#?AutoLoginAgain=.*\$|AutoLoginAgain=true|" \
-		  -e "s|^#?AutoLoginUser=.*\$|AutoLoginUser=${LIVE_USERNAME}|" \
+	sed -i -r -e "s|^#.*AutoLoginEnable=.*\$|AutoLoginEnable=true|" \
+		  -e "s|^#.*AutoLoginAgain=.*\$|AutoLoginAgain=true|" \
+		  -e "s|^#.*AutoLoginUser=.*\$|AutoLoginUser=${LIVE_USERNAME}|" \
 	/etc/kde4/kdm/kdmrc
 
 	# language
 	if [ -n "${_LANGUAGE}" ]
 	then
-		sed -i -r -e "s|^#?Language=.*\$|Language=${_LANGUAGE}|" \
+		sed -i -r -e "s|^#.*Language=.*\$|Language=${_LANGUAGE}|" \
 			/etc/kde4/kdm/kdmrc
 	fi
 
diff --git a/scripts/config/009-lightdm b/scripts/config/009-lightdm
index 90e2dc9..4846e50 100755
--- a/scripts/config/009-lightdm
+++ b/scripts/config/009-lightdm
@@ -34,8 +34,8 @@ 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|" \
+		sed -i -r -e "s|^#.*autologin-user=.*\$|autologin-user=${LIVE_USERNAME}|" \
+			  -e "s|^#.*autologin-user-timeout=.*\$|autologin-user-timeout=0|" \
 		/etc/lightdm/lightdm.conf
 	fi
 
diff --git a/scripts/config/010-lxdm b/scripts/config/010-lxdm
index 64c7532..31a8a45 100755
--- a/scripts/config/010-lxdm
+++ b/scripts/config/010-lxdm
@@ -34,8 +34,8 @@ Configure_lxdm ()
 {
 	if [ -e /etc/lxdm/lxdm.conf ]
 	then
-		sed -i -r -e "s|^#?autologin=.*\$|autologin=${LIVE_USERNAME}|" \
-			  -e "s|^#?session.*\$|session|" \
+		sed -i -r -e "s|^#.*autologin=.*\$|autologin=${LIVE_USERNAME}|" \
+			  -e "s|^#.*session.*\$|session|" \
 		/etc/lxdm/lxdm.conf
 	fi
 
diff --git a/scripts/config/012-slim b/scripts/config/012-slim
index 373cb38..5365555 100755
--- a/scripts/config/012-slim
+++ b/scripts/config/012-slim
@@ -39,8 +39,8 @@ Configure_slim ()
 	fi
 
 	# autologin
-	sed -i -r -e "s|^#?auto_login.*\$|auto_login yes|" \
-		  -e "s|^#?default_user.*\$|default_user ${LIVE_USERNAME}|" \
+	sed -i -r -e "s|^#.*auto_login.*\$|auto_login yes|" \
+		  -e "s|^#.*default_user.*\$|default_user ${LIVE_USERNAME}|" \
 	/etc/slim.conf
 
 	# Avoid xinit

-- 
live-config