diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-02-21 00:37:32 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:04 +0100 |
| commit | afa0ce7b8405da9dd4c77744c96e97dc65e9650d (patch) | |
| tree | cf686a1a4160dc5c862dec73788cdf3eddc6df56 /functions | |
| parent | 585a301424443e82e5b680d2b1fcb438c3d8a0cf (diff) | |
| download | vyos-live-build-afa0ce7b8405da9dd4c77744c96e97dc65e9650d.tar.gz vyos-live-build-afa0ce7b8405da9dd4c77744c96e97dc65e9650d.zip | |
Updating tasks handling for squeeze.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index f46ec231d..140cc650f 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -618,22 +618,56 @@ Set_defaults () gnome-desktop) LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|gnome-desktop||') standard-x11" - LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop" + case "${LH_DISTRIBUTION}" in + lenny) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||') standard gnome-desktop desktop" + ;; + + *) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop" + ;; + esac ;; kde-desktop) LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|kde-desktop||') standard-x11" - LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop" + + case "${LH_DISTRIBUTION}" in + lenny) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||') standard kde-desktop desktop" + ;; + + *) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop" + esac ;; lxde-desktop) LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|lxde-desktop||') standard-x11" - LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop" + + case "${LH_DISTRIBUTION}" in + lenny) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||') standard lxde-desktop desktop" + ;; + + *) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop" + ;; + esac ;; xfce-desktop) LH_PACKAGES_LISTS="$(echo ${LH_PACKAGES_LISTS} | sed -e 's|xfce-desktop||') standard-x11" - LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop" + + case "${LH_DISTRIBUTION}" in + lenny) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||') standard xfce-desktop desktop" + ;; + + *) + LH_TASKS="$(echo ${LH_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop" + ;; + esac ;; esac done |