summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-08-08 03:53:52 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:17 +0100
commit6a12b2dfd5d521c23a801ed0ba995a2691fd9718 (patch)
tree6fbd904e63e8ac2e4cd447830fd8a7969975697c
parent1ebf50084b2fdd60883ed6bd84171c02223b1889 (diff)
downloadvyos-live-build-6a12b2dfd5d521c23a801ed0ba995a2691fd9718.tar.gz
vyos-live-build-6a12b2dfd5d521c23a801ed0ba995a2691fd9718.zip
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@debian.org> for finding this solution.
-rwxr-xr-xscripts/build/chroot_tasks22
1 files changed, 22 insertions, 0 deletions
diff --git a/scripts/build/chroot_tasks b/scripts/build/chroot_tasks
index 6c7d274e7..892954d00 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
;;