diff options
| author | Ryan Finnie <ryan@finnie.org> | 2021-02-05 10:30:31 -0800 |
|---|---|---|
| committer | Ryan Finnie <ryan@finnie.org> | 2021-02-17 22:02:47 -0800 |
| commit | a0400b24998e247f32f95a492ed4f3f6ab053ada (patch) | |
| tree | 8fb6b46515f11b7de69eedc4506f9e262d8871be | |
| parent | 965d75053de219c517ab49d833d0c8c311684658 (diff) | |
| download | vyos-live-build-a0400b24998e247f32f95a492ed4f3f6ab053ada.tar.gz vyos-live-build-a0400b24998e247f32f95a492ed4f3f6ab053ada.zip | |
Use --apt-http-proxy/--apt-ftp-proxy for debootstrap
| -rw-r--r-- | manpages/en/lb_config.1 | 4 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 2 | ||||
| -rwxr-xr-x | scripts/build/config | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 898d6840c..91e6a55be 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -239,9 +239,9 @@ In addition to its specific options \fBlb config\fR understands all generic live .IP "\fB\-\-apt\fR apt|apt-get|aptitude" 4 defines if apt\-get or aptitude is used to install packages when building the image. The default is apt. .IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4 -sets the FTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by apt internally within the chroot, it is not used for anything else. +sets the FTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by initial debootstrap, and by apt internally within the chroot. It is not used for anything else. .IP "\fB\-\-apt\-http\-proxy\fR \fIURL\fR" 4 -sets the HTTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by apt internally within the chroot, it is not used for anything else. +sets the HTTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by initial debootstrap, and by apt internally within the chroot. It is not used for anything else. .IP "\fB\-\-apt\-indices\fR true|false" 4 defines if the resulting images should have apt indices or not and defaults to true. .IP "\fB\-\-apt\-options\fR \fIOPTION\fR|""\fIOPTIONS\fR""" 4 diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index e0278844c..52fdfdee4 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -86,7 +86,7 @@ then Print_breakage Echo_message "Running debootstrap (download-only)..." - debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} + /usr/bin/env http_proxy="${LB_APT_HTTP_PROXY}" ftp_proxy="${LB_APT_FTP_PROXY}" debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LB_PARENT_DISTRIBUTION_CHROOT}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" ${DEBOOTSTRAP_SCRIPT} # Removing old cache rm -f cache/packages.bootstrap/*.deb diff --git a/scripts/build/config b/scripts/build/config index a5e578c3e..59fcf1f3f 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -963,10 +963,10 @@ LB_CONFIGURATION_VERSION="${LB_CONFIGURATION_VERSION}" # Set package manager LB_APT="${LB_APT}" -# Set apt/aptitude ftp proxy +# Set apt/aptitude/debootstrap ftp proxy LB_APT_FTP_PROXY="${LB_APT_FTP_PROXY}" -# Set apt/aptitude http proxy +# Set apt/aptitude/debootstrap http proxy LB_APT_HTTP_PROXY="${LB_APT_HTTP_PROXY}" # Set apt/aptitude pipeline depth |