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

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 560ef4b959336ba4555955d1597a8962e1683c0b
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Sep 15 12:03:18 2010 +0200

    Renaming xinit.sh to zz-xinit.sh in /etc/profile.d to ensure it is run last.

diff --git a/scripts/config/012-xinit b/scripts/config/012-xinit
index e920aee..fa1dbc5 100755
--- a/scripts/config/012-xinit
+++ b/scripts/config/012-xinit
@@ -26,7 +26,7 @@ Xinit ()
 Configure_xinit ()
 {
 	# Checking if if package is already configured differently
-	if [ -e /etc/profile.d/xinit.sh ] || grep -qs "startx" /etc/skel/.bash_profile
+	if [ -e /etc/profile.d/zz-xinit.sh ] || grep -qs "startx" /etc/skel/.bash_profile
 	then
 		return
 	fi
@@ -35,7 +35,7 @@ Configure_xinit ()
 	then
 
 # squeeze
-cat > /etc/profile.d/xinit.sh << EOF
+cat > /etc/profile.d/zz-xinit.sh << EOF
 if [ -z "\${DISPLAY}" ] && [ \$(tty) = /dev/tty1 ]
 then
 	while true

-- 
live-config