[SCM] live-config branch, debian-old-2.0, updated. debian/2.0.9-1-1-g5f4bc74

[Daniel Baumann]

The following commit has been merged in the debian-old-2.0 branch:
commit 5f4bc741a9849dddb7b1638a6e9161a30ddcdaf9
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Oct 27 19:58:05 2010 +0200

    Disabling xinit hack when using persistency and another display manager has been configured (Closes: #601235).

diff --git a/scripts/config/006-gdm b/scripts/config/006-gdm
index 19ace78..e637dd3 100755
--- a/scripts/config/006-gdm
+++ b/scripts/config/006-gdm
@@ -11,12 +11,20 @@
 Gdm ()
 {
 	# Checking if package is installed or already configured
-	if [ ! -e /var/lib/dpkg/info/gdm.list ] || \
-	   [ -e /var/lib/live/config/gdm ]
+	if [ ! -e /var/lib/dpkg/info/gdm.list ]
 	then
 		return
 	fi
 
+	if [ -e /var/lib/live/config/gdm ]
+	then
+		# Avoid xinit
+		_X11="true"
+		export _X11
+
+		return
+	fi
+
 	echo -n " gdm"
 
 	Configure_gdm
diff --git a/scripts/config/007-gdm3 b/scripts/config/007-gdm3
index d26a095..bd84917 100755
--- a/scripts/config/007-gdm3
+++ b/scripts/config/007-gdm3
@@ -11,12 +11,20 @@
 Gdm3 ()
 {
 	# Checking if package is installed or already configured
-	if [ ! -e /var/lib/dpkg/info/gdm3.list ] || \
-	   [ -e /var/lib/live/config/gdm3 ]
+	if [ ! -e /var/lib/dpkg/info/gdm3.list ]
 	then
 		return
 	fi
 
+	if [ -e /var/lib/live/config/gdm3 ]
+	then
+		# Avoid xinit
+		_X11="true"
+		export _X11
+
+		return
+	fi
+
 	echo -n " gdm3"
 
 	Configure_gdm3
diff --git a/scripts/config/008-kdm b/scripts/config/008-kdm
index 8a723bf..ed4432c 100755
--- a/scripts/config/008-kdm
+++ b/scripts/config/008-kdm
@@ -11,12 +11,20 @@
 Kdm ()
 {
 	# Checking if package is installed or already configured
-	if [ ! -e /var/lib/dpkg/info/kdm.list ] || \
-	   [ -e /var/lib/live/config/kdm ]
+	if [ ! -e /var/lib/dpkg/info/kdm.list ]
 	then
 		return
 	fi
 
+	if [ -e /var/lib/live/config/kdm ]
+	then
+		# Avoid xinit
+		_X11="true"
+		export _X11
+
+		return
+	fi
+
 	echo -n " kdm"
 
 	Configure_kdm
diff --git a/scripts/config/009-lxdm b/scripts/config/009-lxdm
index faf3d87..de9a0ad 100755
--- a/scripts/config/009-lxdm
+++ b/scripts/config/009-lxdm
@@ -11,12 +11,20 @@
 Lxdm ()
 {
 	# Checking if package is installed or already configured
-	if [ ! -e /var/lib/dpkg/info/lxdm.list ] || \
-	   [ -e /var/lib/live/config/lxdm ]
+	if [ ! -e /var/lib/dpkg/info/lxdm.list ]
 	then
 		return
 	fi
 
+	if [ -e /var/lib/live/config/lxdm ]
+	then
+		# Avoid xinit
+		_X11="true"
+		export _X11
+
+		return
+	fi
+
 	echo -n " lxdm"
 
 	Configure_lxdm
diff --git a/scripts/config/010-nodm b/scripts/config/010-nodm
index af95b03..be5dda2 100755
--- a/scripts/config/010-nodm
+++ b/scripts/config/010-nodm
@@ -12,11 +12,19 @@ Nodm ()
 {
 	# Checking if package is installed or already configured
 	if [ ! -e /var/lib/dpkg/info/nodm.list ] || \
-	   [ -e /var/lib/live/config/nodm ]
 	then
 		return
 	fi
 
+	if [ -e /var/lib/live/config/nodm ]
+	then
+		# Avoid xinit
+		_X11="true"
+		export _X11
+
+		return
+	fi
+
 	echo -n " nodm"
 
 	Configure_nodm
diff --git a/scripts/config/011-slim b/scripts/config/011-slim
index b90ceb9..8fcda6d 100755
--- a/scripts/config/011-slim
+++ b/scripts/config/011-slim
@@ -11,12 +11,20 @@
 Slim ()
 {
 	# Checking if package is installed or already configured
-	if [ ! -e /var/lib/dpkg/info/slim.list ] || \
-	   [ -e /var/lib/live/config/slim ]
+	if [ ! -e /var/lib/dpkg/info/slim.list ]
 	then
 		return
 	fi
 
+	if [ -e /var/lib/live/config/slim ]
+	then
+		# Avoid xinit
+		_X11="true"
+		export _X11
+
+		return
+	fi
+
 	echo -n " slim"
 
 	Configure_slim
diff --git a/scripts/config/012-xinit b/scripts/config/012-xinit
index fa1dbc5..3b9fe9a 100755
--- a/scripts/config/012-xinit
+++ b/scripts/config/012-xinit
@@ -10,10 +10,17 @@
 
 Xinit ()
 {
+	# Checking if a display manager has been configured
+	if [ "${_X11}" = "true" ]
+	then
+		rm -f /etc/profile.d/zz-xinit.sh
+
+		return
+	fi
+
 	# Checking if package is installed or already configured
 	if [ ! -e /var/lib/dpkg/info/xinit.list ] || \
-	   [ -e /var/lib/live/config/xinit ] || \
-	   [ "${_X11}" = "true" ]
+	   [ -e /var/lib/live/config/xinit ]
 	then
 		return
 	fi

-- 
live-config