From f2d57e26ed53933ae538f332580daa4c9a3b4428 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 16 Dec 2012 23:43:48 +0100
Subject: Removing old code in chroot_hacks for tasks which are not used
 anymore.

---
 scripts/build/chroot_hacks | 88 ----------------------------------------------
 1 file changed, 88 deletions(-)

(limited to 'scripts/build/chroot_hacks')

diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
index 6fcd35e02..58f8e7064 100755
--- a/scripts/build/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -38,22 +38,6 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_PARENT_DISTRIBUTION}" in
-	squeeze)
-		if echo "${LB_TASKS}" | grep -qs lxde ||
-			echo "${LB_TASKS}" | grep -qs xfce
-		then
-			GDM="gdm"
-		else
-			GDM="gdm3"
-		fi
-		;;
-
-	*)
-		GDM="gdm3"
-		;;
-esac
-
 # Handling default desktop configuration
 case "${LB_MODE}" in
 	debian*)
@@ -68,78 +52,6 @@ case "${LB_MODE}" in
 		;;
 esac
 
-for TASK in ${LB_TASKS}
-do
-	case "${TASK}" in
-		gnome-desktop)
-			# gnome is the only desktop environment in this image
-			if [ -z "$(echo ${LB_TASKS} | sed -e 's|gnome-desktop||' -e 's| 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 ${LB_TASKS} | sed -e 's|kde-desktop||' -e 's| 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"
-
-				# get rid of resolvconf
-				Chroot chroot "dpkg -P resolvconf"
-			fi
-			;;
-
-		lxde-desktop)
-			# lxde is the only desktop environment in this image
-			if [ -z "$(echo ${LB_TASKS} | sed -e 's|lxde-desktop||' -e 's| 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
-			;;
-
-		xfce-desktop)
-			# xfce is the only desktop environment in this image
-			if [ -z "$(echo ${LB_TASKS} | sed -e 's|xfce-desktop||' -e 's| 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
-
 case "${LB_BINARY_IMAGES}" in
 	netboot)
 		if [ ! -f chroot/sbin/mount.cifs ]
-- 
cgit v1.2.3