summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-01-01 20:55:29 +0000
committerTails developers <amnesia@boum.org>2015-01-01 20:55:29 +0000
commitf7339bc1b1abb57ee5c55157028d023863a984db (patch)
tree93e6f50b1526d1f3fff62cb9e9182e6a7bd9aa34 /config/binary_local-hooks
parent50c510d2c5383749f582e0e03c5c30ceae738030 (diff)
parenteecb76851deffad99b375c05f4bb7d0fdb2ea84c (diff)
Merge remote-tracking branch 'origin/devel' into feature/jessie
Conflicts: config/chroot_apt/preferences config/chroot_local-hooks/52-update-rc.d config/chroot_local-includes/etc/polipo/config config/chroot_local-patches/torsocks_gobby-0.5.patch
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
index 27a1cdd..8fc75e1 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -43,13 +43,12 @@ cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin"
cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
> "$CHROOT_TEMP_APT_SOURCES"
-mv chroot/etc/apt/apt.conf.d/{,.}0000runtime-proxy
+Chroot chroot /usr/local/lib/apt-toggle-tor-http off
Chroot chroot apt-get --yes update
Chroot chroot apt-get --yes install dpkg-dev
Chroot chroot apt-get source syslinux="$(syslinux_deb_version_in_chroot)"
cp chroot/syslinux-*/bios/win32/syslinux.exe "$WIN32_BINARY_UTILS_DIR/"
rm -r chroot/syslinux*
rm "$CHROOT_TEMP_APT_SOURCES"
-mv chroot/etc/apt/apt.conf.d/{.,}0000runtime-proxy
-Chroot chroot apt-get --yes update
+Chroot chroot /usr/local/lib/apt-toggle-tor-http on
Chroot chroot apt-get --yes purge dpkg-dev make # dpkg-dev depends on make