[SCM] live-config branch, debian-next, updated. debian/3.0_a6-1-7-g3a1ef0a

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 4e90ecf68ffd620ee2a196feda76bfb1db17c707
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 15 12:14:04 2010 +0200

    Removing legacy support for lenny in xinit script.

diff --git a/scripts/config/012-xinit b/scripts/config/012-xinit
index fa1dbc5..21c5ce5 100755
--- a/scripts/config/012-xinit
+++ b/scripts/config/012-xinit
@@ -26,15 +26,11 @@ Xinit ()
 Configure_xinit ()
 {
 	# Checking if if package is already configured differently
-	if [ -e /etc/profile.d/zz-xinit.sh ] || grep -qs "startx" /etc/skel/.bash_profile
+	if [ -e /etc/profile.d/zz-xinit.sh ]
 	then
 		return
 	fi
 
-	if [ -e /etc/profile.d ]
-	then
-
-# squeeze
 cat > /etc/profile.d/zz-xinit.sh << EOF
 if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
 then
@@ -45,21 +41,6 @@ then
 fi
 EOF
 
-	else
-
-# lenny
-cat >> /etc/skel/.bash_profile << EOF
-if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
-then
-	while true
-	do
-		startx
-	done
-fi
-EOF
-
-	fi
-
 	# Creating state file
 	touch /var/lib/live/config/xinit
 }

-- 
live-config