manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use --apt-http-proxy/--apt-ftp-proxy for debootstrap

This commit is contained in:
Ryan Finnie 2021-02-05 10:30:31 -08:00
parent 965d75053d
commit a0400b2499
No known key found for this signature in database
GPG Key ID: 7E60A3A686AE8D98
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manpages/en/lb_config.1
View File

@ -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

2
scripts/build/bootstrap_debootstrap
View File

@ -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

4
scripts/build/config
View File

@ -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