From b73c2d0d31e150e9bcfac07255df83d28dcfa727 Mon Sep 17 00:00:00 2001 From: JeremyRand Date: Sat, 19 Oct 2019 05:26:38 +0000 Subject: [PATCH] Bump tor-browser-build to tbb-9.0-build2 Also update Makefile and rbm.conf to sync with upstream changes --- rbm.conf | 2 ++ tor-browser-build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index e1b227a..474b38a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -349,6 +349,8 @@ runc: EOF [% IF c("var/container/disable_network/" _ c("exec_name")) -%] sudo ip netns add 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' + # make sure the lo interface is up (see bug 31293) + sudo ip netns exec 'rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %]' ip link set lo up [% END -%] sudo runc [% IF c("var_p/runc100") %]run[% ELSE %]start[% END %] -b '[% c("var/container/dir") %]' rbm-[% sha256(c("build_id", { error_if_undef => 1 })) %] [% IF c("runc_hide_stderr") %]2>/dev/null[% END %] [% IF c("var/container/disable_network/" _ c("exec_name")) -%] diff --git a/tor-browser-build b/tor-browser-build index 9d25316..803d014 160000 --- a/tor-browser-build +++ b/tor-browser-build @@ -1 +1 @@ -Subproject commit 9d253167005def507583f90f01f0fc96e2bdbe07 +Subproject commit 803d014ed9be0ff5a2ee253798f3c3e9b0fc1723