diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-07-29 11:30:53 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-07-29 11:30:53 +0200 |
| commit | cba1c05b33f72a9fda77fc634249374b919736df (patch) | |
| tree | 889457f7169caa8a7793ba317ea7693b3a804feb | |
| parent | b1816122229610b7a7b7e3914dd865badc095d77 (diff) | |
| download | vyos-live-build-cba1c05b33f72a9fda77fc634249374b919736df.tar.gz vyos-live-build-cba1c05b33f72a9fda77fc634249374b919736df.zip | |
Handle package-lists parameter for lb_config in live-build-cron-images script for both lb version 2.x and 3.x.
| -rwxr-xr-x | cron/live-build-cron-images | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/cron/live-build-cron-images b/cron/live-build-cron-images index ed709a259..b55c6ef59 100755 --- a/cron/live-build-cron-images +++ b/cron/live-build-cron-images @@ -167,6 +167,18 @@ Build () rm -rf cache/stages_rootfs rm -f config/* || true + LB_VERSION="$(lb --version | awk '/^live-build, version / { print $3 }')" + + case "${LB_VERSION}" in + 2.0*) + _PACKAGE_LISTS="--packages-lists ${FLAVOUR}" + ;; + + 3.0*) + _PACKAGE_LISTS="--package-lists ${FLAVOUR}" + ;; + esac + # FIXME: cdebootstrap lb config --clean \ --bootstrap cdebootstrap \ @@ -177,7 +189,7 @@ Build () --mirror-bootstrap ${MIRROR_BOOTSTRAP} \ --mirror-chroot ${MIRROR_CHROOT} \ --mirror-chroot-security ${MIRROR_CHROOT_SECURITY} \ - --packages-lists ${FLAVOUR} + ${_PACKAGE_LISTS} lb build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log |