diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-11 11:37:37 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-11 11:37:37 +0200 |
| commit | b3ad2f412a5b37c172fc44ecd8982ef30e14205c (patch) | |
| tree | 8bc7d847683bfd60fbc395966b5003291a881d3e /functions | |
| parent | cf8f6cee930a2f1a19415a3ba8ca395310162c42 (diff) | |
| download | vyos-live-build-b3ad2f412a5b37c172fc44ecd8982ef30e14205c.tar.gz vyos-live-build-b3ad2f412a5b37c172fc44ecd8982ef30e14205c.zip | |
Dropping handling of --packages in order to simply things handle packages scheduled for installation through package lists only.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 5d0761a2e..0b7119fbc 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -726,16 +726,8 @@ Set_defaults () ;; esac - # Setting packages string - case "${LB_MODE}" in - ubuntu) - LB_PACKAGES="${LB_PACKAGES:-ubuntu-minimal}" - ;; - - *) - LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}" - ;; - esac + # Setting package list + LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}" # Setting tasks string if [ -z "${LB_TASKS}" ] || [ "${LB_TASKS}" != "none" ] @@ -760,28 +752,24 @@ Set_defaults () 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" 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" 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" 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 |