diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:35 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:35 +0200 |
| commit | 877d8dd14c0f97bf64db6ab21d23da98dd64fdd5 (patch) | |
| tree | 29568f319d862b3e47be3179f11170649b52bc20 /src/scripts/11bootstrap.sh | |
| parent | a194193638c1dfa55164fa318b5c8ab8f735d746 (diff) | |
| download | live-build-877d8dd14c0f97bf64db6ab21d23da98dd64fdd5.zip live-build-877d8dd14c0f97bf64db6ab21d23da98dd64fdd5.tar.gz | |
Adding live-package 0.99.12-1.
Diffstat (limited to 'src/scripts/11bootstrap.sh')
| -rw-r--r-- | src/scripts/11bootstrap.sh | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/scripts/11bootstrap.sh b/src/scripts/11bootstrap.sh index f2f6c0a..9aee5ec 100644 --- a/src/scripts/11bootstrap.sh +++ b/src/scripts/11bootstrap.sh @@ -13,25 +13,21 @@ Bootstrap () { if [ ! -f "${LIVE_ROOT}"/.stage/bootstrap ] then - # Use proxy - if [ -n "${LIVE_PROXY_FTP}" ] && [ -z "${ftp_proxy}" ] - then - export ftp_proxy="${LIVE_PROXY_FTP}" - fi - - if [ -n "${LIVE_PROXY_HTTP}" ] && [ -z "${http_proxy}" ] - then - export http_proxy="${LIVE_PROXY_HTTP}" - fi - # Create chroot directory if [ ! -d "${LIVE_CHROOT}" ] then mkdir -p "${LIVE_CHROOT}" fi + if [ -n "${LIVE_BOOTSTRAP_CONFIG}" ]; then + SUITE_CONFIG="--suite-config ${LIVE_BOOTSTRAP_CONFIG}" + fi + # Bootstrap system - cdebootstrap --arch="${LIVE_ARCHITECTURE}" --flavour="${LIVE_FLAVOUR}" "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" + cdebootstrap --arch="${LIVE_ARCHITECTURE}" --flavour="${LIVE_FLAVOUR}" ${SUITE_CONFIG} "${LIVE_DISTRIBUTION}" "${LIVE_CHROOT}" "${LIVE_MIRROR}" + + # Remove unused packages + Chroot_exec "apt-get remove --purge --yes cdebootstrap-helper-diverts" # Remove package cache rm -rf "${LIVE_CHROOT}"/var/cache/bootstrap |