diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-03 11:47:08 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-03 11:47:08 +0200 |
| commit | 338ebe5e6b432cdf8777e55b1ef538faa573b33c (patch) | |
| tree | 972108cce96924dfa9f4b3d148f8aaa47019cb86 | |
| parent | e4928dc223c937cbb2c92f4faeaae18330d2bce6 (diff) | |
| download | vyos-live-build-338ebe5e6b432cdf8777e55b1ef538faa573b33c.tar.gz vyos-live-build-338ebe5e6b432cdf8777e55b1ef538faa573b33c.zip | |
Correcting wrong task defaults.
| -rwxr-xr-x | functions/defaults.sh | 79 |
1 files changed, 41 insertions, 38 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index bbe2ac45d..94634517f 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -722,54 +722,57 @@ Set_defaults () esac # Setting tasks string - for LIST in ${LB_PACKAGE_LISTS} - do - case "${LIST}" in - stripped|minimal) - LB_APT="apt-get" - ;; + 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" - ;; + 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" - ;; + 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" - LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" - ;; + 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" + LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" + ;; - kde-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|kde-desktop||') standard-x11" + 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" - LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" - ;; + LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop" + LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" + ;; - lxde-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|lxde-desktop||') standard-x11" + 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" - LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" - ;; + LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop" + LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" + ;; - xfce-desktop) - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's|xfce-desktop||') standard-x11" + 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" - LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" - ;; - esac - done + LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop" + LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher" + ;; + esac + done - LB_PACKAGE_LISTS="$(echo ${LB_PACKAGE_LISTS} | sed -e 's| ||g')" - LB_TASKS="$(echo ${LB_TASKS} | sed -e 's| ||g')" + 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 |