[SCM] live-build branch, debian-next, updated. debian/2.0_a21-1-12-g6ab4c8d

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 6ab4c8d6045e3bd6dd7bdc7b3e7f7a6b1a95bb08
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Aug 8 03:53:52 2010 +0200

    Setting default desktop for tasksel when installing package tasks to avoid ending up with a pulled in gnome in all cases, thanks a lot to Ben Armstrong <synrg at debian.org> for finding this solution.

diff --git a/scripts/build/chroot_tasks b/scripts/build/chroot_tasks
index 6c7d274..892954d 100755
--- a/scripts/build/chroot_tasks
+++ b/scripts/build/chroot_tasks
@@ -65,6 +65,28 @@ then
 		tasksel)
 			for TASK in ${LH_TASKS}
 			do
+				case "${TASK}" in
+					gnome*)
+						DESKTOP="${DESKTOP} gnome"
+						;;
+
+					kde*)
+						DESKTOP="${DESKTOP} kde"
+						;;
+
+					lxde*)
+						DESKTOP="${DESKTOP} lxde"
+						;;
+
+					xfce*)
+						DESKTOP="${DESKTOP} xfce"
+						;;
+				esac
+
+				echo "tasksel tasksel/desktop multiselect ${DESKTOP}" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+
 				Chroot chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
 			done
 			;;

-- 
live-build