mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 11:43:25 +02:00
make.sh: Copy the proxy configuration whenever we enable networking
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
15
make.sh
15
make.sh
@@ -571,19 +571,12 @@ prepareenv() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
entershell() {
|
entershell() {
|
||||||
local environ=(
|
|
||||||
# HTTP(S) Proxy
|
|
||||||
"https_proxy=${https_proxy}"
|
|
||||||
"http_proxy=${http_proxy}"
|
|
||||||
)
|
|
||||||
|
|
||||||
echo "Entering to a shell inside the build environment, go out with exit"
|
echo "Entering to a shell inside the build environment, go out with exit"
|
||||||
|
|
||||||
local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "
|
local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "
|
||||||
|
|
||||||
# Run an interactive shell
|
# Run an interactive shell
|
||||||
execute --chroot --interactive --network \
|
execute --chroot --interactive --network bash -i
|
||||||
"${environ[@]}" bash -i
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lfsmakecommoncheck() {
|
lfsmakecommoncheck() {
|
||||||
@@ -760,6 +753,12 @@ execute() {
|
|||||||
|
|
||||||
--network)
|
--network)
|
||||||
network="true"
|
network="true"
|
||||||
|
|
||||||
|
# Export the proxy configuration
|
||||||
|
environ+=(
|
||||||
|
[https_proxy]="${https_proxy}"
|
||||||
|
[http_proxy]="${http_proxy}"
|
||||||
|
)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--timer=*)
|
--timer=*)
|
||||||
|
|||||||
Reference in New Issue
Block a user