summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-12-14 07:21:44 +0000
committerintrigeri <intrigeri@boum.org>2017-12-14 07:21:44 +0000
commitcf8100941230abbbe3d5f4cabcd865c0acc90527 (patch)
treeae3aaee1a3c0e13f8bdb0ffb4fbdeaf26e674001 /vagrant
parentdf1decf16a825cca83e517f57aac534e1f94806d (diff)
parent19befbd9ca6955b52610a8a720e67f191b1cc566 (diff)
Merge branch 'stable' into devel
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/provision/assets/build-tails12
1 files changed, 0 insertions, 12 deletions
diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails
index ef1ae4f..87fd478 100755
--- a/vagrant/provision/assets/build-tails
+++ b/vagrant/provision/assets/build-tails
@@ -108,18 +108,6 @@ if [ "${TAILS_PROXY_TYPE}" = "vmproxy" ]; then
"/var/cache/apt-cacher-ng/apt-cacher-ng-log/main_*.html" >&2
fi
-if [ "${TAILS_MERGE_BASE_BRANCH}" != 1 ]; then
- # Since $TAILS_GIT_DIR is guaranteed persistent until the VM
- # is shutdown let's build the website while there so it is
- # cached throughout the session. This will make rebuilds after
- # failures much faster.
- # We don't do this when the "merge base branch" option is
- # enabled, since ./build-website updates PO files, resulting
- # in a conflict when the base branch is merged later in case
- # it updates the same PO files.
- ./build-website
-fi
-
BUILD_DIR=$(mktemp -d /tmp/tails-build.XXXXXXXX)
if [ "${TAILS_RAM_BUILD}" ]; then
as_root_do mount -t tmpfs -o "noatime,size=100%,mode=0770,uid=root,gid=${USER}" tmpfs "${BUILD_DIR}"