commit 262ad8f15fc870023b4cfc7399f6908f11056342 Author: Nicolas Vigier boklm@torproject.org Date: Thu Mar 31 12:44:32 2016 +0200

Bug 18127: use different GITIAN_HOST_IP for KVM and LXC --- libexec/config-bootstrap-fixup | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libexec/config-bootstrap-fixup b/libexec/config-bootstrap-fixup index 61d69b0..984892e 100755 --- a/libexec/config-bootstrap-fixup +++ b/libexec/config-bootstrap-fixup @@ -2,9 +2,13 @@

wd=`pwd`

-# Default host IP is 10.0.2.2 +# Default host IP is 10.0.2.2 for KVM and 10.0.3.1 for LXC builds if [ -z "$GITIAN_HOST_IP" ]; then - GITIAN_HOST_IP=10.0.2.2 + if [ -z "$USE_LXC" ]; then + GITIAN_HOST_IP=10.0.2.2 + else + GITIAN_HOST_IP=10.0.3.1 + fi fi

# Default to host IP if the MIRROR_HOST is not set, or set to 127.0.0.1