summaryrefslogtreecommitdiffstats
path: root/vagrant
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-10-19 07:57:37 +0000
committerintrigeri <intrigeri@boum.org>2019-10-19 07:57:37 +0000
commit6c7b1aaf63e77b4a3b47a53799563cb422885ecc (patch)
tree9ecec1ab9871a4267de47507ef2eaf5172bd5049 /vagrant
parent23c771bea0d87a8eb0d464903f0aa5bf54cb56b3 (diff)
Vagrant: remove obsolete hack
This hack was originally added to fix #12530, that is, to ensure that services won't start when we install packages in postinstall.sh. It's not needed anymore since we now have /proc in the chroot, which enables detection of chroot by various pieces of code, including the one that would otherwise start services.
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/definitions/tails-builder/customize.sh9
1 files changed, 0 insertions, 9 deletions
diff --git a/vagrant/definitions/tails-builder/customize.sh b/vagrant/definitions/tails-builder/customize.sh
index 0b58e4c..e9069a8 100755
--- a/vagrant/definitions/tails-builder/customize.sh
+++ b/vagrant/definitions/tails-builder/customize.sh
@@ -15,18 +15,9 @@ cp "${CURDIR}/postinstall.sh" "${ROOT}/postinstall.sh"
cp "${CURDIR}/../../../config/chroot_sources/tails.binary.gpg" "${ROOT}/tmp/"
chmod +x "${ROOT}/postinstall.sh"
-# Disable daemon auto-start
-cat > "${ROOT}/usr/sbin/policy-rc.d" <<EOF
-#!/bin/sh
-exit 101
-EOF
-chmod a+x "${ROOT}/usr/sbin/policy-rc.d"
-
trap "umount ${ROOT}/proc" EXIT HUP INT QUIT TERM
chroot "${ROOT}" mount -t proc proc /proc
chroot "${ROOT}" "/postinstall.sh"
-rm "${ROOT}/usr/sbin/policy-rc.d"
-
rm -f "${ROOT}/postinstall.sh"
mv "${ROOT}/etc/resolv.conf.orig" "${ROOT}/etc/resolv.conf"