From a1c4763a024e7b091e5e1333f1e4427d534378eb Mon Sep 17 00:00:00 2001 From: Chris Lamb Date: Sun, 10 Aug 2008 23:02:01 +0100 Subject: Don't include the bootstrap .debs on live-installer based disks (saves ~30MiB). --- helpers/lh_binary_debian-installer | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 94e14ea..27afa7c 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -415,19 +415,22 @@ then done fi - # Including base debian packages - if [ -d cache/packages_bootstrap ] + if [ "${LH_DEBIAN_INSTALLER}" != "live" ] then - for FILE in cache/packages_bootstrap/*.deb - do - Install_file "${FILE}" "binary/pool/main" - done - else - Echo_error "Could not find cache/packages_bootstrap." - Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and" - Echo_error "LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being" - Echo_error "cached - these are required when integrating the Debian Installer." - exit 1 + # Including base debian packages + if [ -d cache/packages_bootstrap ] + then + for FILE in cache/packages_bootstrap/*.deb + do + Install_file "${FILE}" "binary/pool/main" + done + else + Echo_error "Could not find cache/packages_bootstrap." + Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and" + Echo_error "LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being" + Echo_error "cached - these are required when integrating the Debian Installer." + exit 1 + fi fi # Including local debs -- cgit v1.0