diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-06-11 10:59:53 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-06-11 11:00:42 +0200 |
| commit | 25f7152e5eeb6be395790aa433dd350ab2766b97 (patch) | |
| tree | e64a6924d708cc836117944043cfb839fde082a2 | |
| parent | 2b2e0fb1bf57ac452c63c69edd5173232c4c28ef (diff) | |
| download | vyos-live-build-25f7152e5eeb6be395790aa433dd350ab2766b97.tar.gz vyos-live-build-25f7152e5eeb6be395790aa433dd350ab2766b97.zip | |
Don't try to install standard task on anything but ubuntu.
| -rwxr-xr-x | scripts/build/lb_chroot_tasks | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/scripts/build/lb_chroot_tasks b/scripts/build/lb_chroot_tasks index 477d75556..96d02d2cc 100755 --- a/scripts/build/lb_chroot_tasks +++ b/scripts/build/lb_chroot_tasks @@ -64,11 +64,25 @@ then # Installing tasks case "${LB_TASKSEL}" in apt) + # This needs to be cleaned up at some point APT_TASKS= - for TASK in ${LB_TASKS} + + case "${LB_MODE}" in + ubuntu) + TASKS="${LB_TASKS}" + ;; + + *) + # Avoid standard tasks which appears to not exist + TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||')" + ;; + esac + + for TASK in ${TASKS} do APT_TASKS="${APT_TASKS:+$APT_TASKS }$TASK^" done + Chroot chroot "apt-get ${APT_OPTIONS} install ${APT_TASKS}" ;; |