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 /functions/defaults.sh | |
| 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 'functions/defaults.sh')
| -rwxr-xr-x | functions/defaults.sh | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 8788aeb3b..f29f1a8cb 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -870,9 +870,6 @@ Set_defaults () ;; esac - # Setting package list - LB_PACKAGE_LISTS="${LB_PACKAGE_LISTS:-standard}" - # Setting security updates option case "${LB_PARENT_DISTRIBUTION}" in jessie|sid) @@ -1276,15 +1273,6 @@ Check_defaults () fi fi - if echo ${LB_PACKAGE_LISTS} | grep -qs -E "(stripped|minimal)\b" - then - # aptitude + stripped|minimal - if [ "${LB_APT}" = "aptitude" ] - then - Echo_warning "You selected LB_PACKAGE_LISTS='%s' and LB_APT='aptitude'" "${LB_PACKAGE_LIST}. This configuration is potentially unsafe, as aptitude is not used in the stripped/minimal package lists." - fi - fi - if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then # d-i true, no caching @@ -1338,14 +1326,6 @@ Check_defaults () Echo_warning "You have specified a value of LB_ISO_VOLUME that is too long; the maximum length is 32 characters." fi - if echo ${LB_PACKAGE_LISTS} | grep -qs -E "(stripped|minimal)\b" - then - if [ "${LB_APT_INDICES}" = "true" ] - then - Echo_warning "You have selected hook to minimise image size but you are still including package indices with your value of LB_APT_INDICES." - fi - fi - # Architectures to use foreign bootstrap for LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES:-}" |