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_debootstrap | |
| 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_debootstrap')
| -rwxr-xr-x | scripts/build/lb_bootstrap_debootstrap | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap index c47354d41..de542ea29 100755 --- a/scripts/build/lb_bootstrap_debootstrap +++ b/scripts/build/lb_bootstrap_debootstrap @@ -77,29 +77,17 @@ then DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LB_BOOTSTRAP_EXCLUDE} | sed 's| *|,|g')" fi -if [ "${LB_USE_FAKEROOT}" != "true" ] -then - if [ -z "${LB_BOOTSTRAP_FLAVOUR}" ] - then - if In_list "stripped minimal" "${LB_PACKAGE_LISTS}" +case "${LB_USE_FAKEROOT}" in + true) + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot" + ;; + false) + if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ] then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase" + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}" fi - else - case "${LB_BOOTSTRAP_FLAVOUR}" in - stripped|minimal) - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase" - ;; - standard) - ;; - - *) - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}" - esac - fi -else - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot" -fi + ;; +esac if [ "${_VERBOSE}" = "true" ] then |