[SCM] live-helper branch, debian-next, updated. debian/2.0_a7-1-16-g3f2ad34

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 3f2ad3443739d572d8e04ba9f078c0ee3581d653
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Feb 21 12:15:43 2010 +0100

    Correcting desktop hacks.

diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks
index c8d1970..19d7af8 100755
--- a/helpers/chroot_hacks
+++ b/helpers/chroot_hacks
@@ -38,71 +38,74 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Handling default desktop configuration
-case "${LH_TASKS}" in
-	gnome-desktop)
-		# gnome is the only desktop environment in this image
-		if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e '| desktop ||' | grep desktop)" ]
-		then
-			# set display manager
-			echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
-			Chroot chroot "debconf-set-selections /root/preseed"
-			rm -f chroot/root/preseed
-			Chroot chroot "dpkg-reconfigure gdm"
-			echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
-
-			# set session manager
-			Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
-		fi
-		;;
+for TASK in ${LH_TASKS}
+do
+	case "${LH_TASKS}" in
+		gnome-desktop)
+			# gnome is the only desktop environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e '| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure gdm"
+				echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
+			fi
+			;;
 
-	kde-desktop)
-		# kde is the only desktop-environment in this image
-		if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e '| desktop ||' | grep desktop)" ]
-		then
-			# set display manager
-			echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
-			Chroot chroot "debconf-set-selections /root/preseed"
-			rm -f chroot/root/preseed
-			Chroot chroot "dpkg-reconfigure kdm"
-			echo "/usr/bin/kdm" > chroot/etc/X11/default-display-manager
-
-			# set session manager
-			Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startkde"
-		fi
-		;;
+		kde-desktop)
+			# kde is the only desktop-environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e '| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure kdm"
+				echo "/usr/bin/kdm" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startkde"
+			fi
+			;;
 
-	lxde-desktop)
-		# lxde is the only desktop environment in this image
-		if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e '| desktop ||' | grep desktop)" ]
-		then
-			# set display manager
-			echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
-			Chroot chroot "debconf-set-selections /root/preseed"
-			rm -f chroot/root/preseed
-			Chroot chroot "dpkg-reconfigure gdm"
-			echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
-
-			# set session manager
-			Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
-		fi
-		;;
+		lxde-desktop)
+			# lxde is the only desktop environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e '| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure gdm"
+				echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
+			fi
+			;;
 
-	xfcde-desktop)
-		# xfce is the only desktop environment in this image
-		if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e '| desktop ||' | grep desktop)" ]
-		then
-			# set display manager
-			echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
-			Chroot chroot "debconf-set-selections /root/preseed"
-			rm -f chroot/root/preseed
-			Chroot chroot "dpkg-reconfigure gdm"
-			echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
-
-			# set session manager
-			Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
-		fi
-		;;
-esac
+		xfcde-desktop)
+			# xfce is the only desktop environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e '| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "gdm shared/default-x-display-manager select gdm" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure gdm"
+				echo "/usr/bin/gdm" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
+			fi
+			;;
+	esac
+done
 
 # Removing udev mac caching rule
 rm -f chroot/etc/udev/rules.d/*persistent-net.rules

-- 
live-helper