[SCM] live-config branch, debian-next, updated. debian/3.0_a1-1-1-g766ee8f

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 766ee8fa166c1b1322431c46c7debea390c8f862
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 10 04:16:53 2010 +0200

    Only run x-session-manager parts when x-session-manager is set.

diff --git a/scripts/config/115-xserver-xorg b/scripts/config/115-xserver-xorg
index 0afdd79..57b72b7 100755
--- a/scripts/config/115-xserver-xorg
+++ b/scripts/config/115-xserver-xorg
@@ -45,15 +45,18 @@ xserver-xorg/config/inputdevice/keyboard/variant
 		echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/options string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
 	fi
 
-	case "${LIVE_X_SESSION_MANAGER}" in
-		none)
-			rm -f /etc/X11/default-display-manager
-			;;
-
-		*)
-			update-alternatives --quiet --set x-session-manager "${LIVE_X_SESSION_MANAGER}"
-			;;
-	esac
+	if [ -n "${LIVE_X_SESSION_MANAGER}" ]
+	then
+		case "${LIVE_X_SESSION_MANAGER}" in
+			none)
+				rm -f /etc/X11/default-display-manager
+				;;
+
+			*)
+				update-alternatives --quiet --set x-session-manager "${LIVE_X_SESSION_MANAGER}"
+				;;
+		esac
+	fi
 
 	if [ -n "${LIVE_XORG_DRIVER}" ]
 	then

-- 
live-config