From f06a2e3d37e382447952e8912e9889e6f22fb1e0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 11 Jun 2011 15:25:33 +0200 Subject: Reworking chroot_tasks into chroot_local-tasklists, now packages and tasks are (almost) handled identical and through local lists only. --- functions/defaults.sh | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'functions') diff --git a/functions/defaults.sh b/functions/defaults.sh index 5b0f57d25..9e34e6a1b 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -738,55 +738,6 @@ Set_defaults () # Setting package list LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}" - # Setting tasks string - if [ -z "${LB_TASKS}" ] || [ "${LB_TASKS}" != "none" ] - then - for LIST in ${LB_PACKAGE_LISTS} - do - case "${LIST}" in - stripped|minimal) - LB_APT="apt-get" - ;; - - standard) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|standard||') standard" - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||') standard" - ;; - - rescue) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|standard||' -e 's|rescue||') standard rescue" - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|rescue||') standard rescue" - ;; - - gnome-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|gnome-desktop||') standard-x11" - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop" - ;; - - kde-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|kde-desktop||') standard-x11" - - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop" - ;; - - lxde-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|lxde-desktop||') standard-x11" - - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop" - ;; - - xfce-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|xfce-desktop||') standard-x11" - - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop" - ;; - esac - done - - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's| ||g')" - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's| ||g')" - fi - # Setting security updates option case "${LB_DISTRIBUTION}" in wheezy|sid|baureo) -- cgit v1.2.3