diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-29 00:24:11 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-29 00:29:23 +0200 |
| commit | 81fb4294538a7204232d3e76195a778df0ee3ee1 (patch) | |
| tree | 1c22dfb0462ff99bf62e188a92e193bbf4f35e60 /scripts/build/lb_bootstrap_cdebootstrap | |
| parent | e81b1c6f7a5c43537d5f5288c24df3faddbe2899 (diff) | |
| download | vyos-live-build-81fb4294538a7204232d3e76195a778df0ee3ee1.tar.gz vyos-live-build-81fb4294538a7204232d3e76195a778df0ee3ee1.zip | |
Dropping global package-lists entirely, only local package lists within the config tree are support.
Diffstat (limited to 'scripts/build/lb_bootstrap_cdebootstrap')
| -rwxr-xr-x | scripts/build/lb_bootstrap_cdebootstrap | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/scripts/build/lb_bootstrap_cdebootstrap b/scripts/build/lb_bootstrap_cdebootstrap index ba7ea8a23..585a9d448 100755 --- a/scripts/build/lb_bootstrap_cdebootstrap +++ b/scripts/build/lb_bootstrap_cdebootstrap @@ -76,26 +76,9 @@ then CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LB_BOOTSTRAP_KEYRING}" fi -if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ] +if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ] then - case "${LB_PACKAGE_LISTS}" in - stripped|minimal) - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal" - ;; - *) - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard" - ;; - esac -else - case "${LB_BOOTSTRAP_FLAVOUR}" in - stripped|minimal) - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal" - ;; - - *) - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}" - ;; - esac + CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LB_BOOTSTRAP_FLAVOUR}" fi if [ "${_DEBUG}" = "true" ] @@ -152,13 +135,6 @@ then ${LB_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot fi - # Remove cdebootstrap-helper-diverts (needed at least for minimal flavours) - case "${LB_PACKAGE_LISTS}" in - stripped|minimal) - Chroot chroot "dpkg -P cdebootstrap-helper-diverts" - ;; - esac - # Deconfiguring cdebootstrap configurations rm -f chroot/etc/apt/sources.list rm -f chroot/etc/hosts |