summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-07-31 08:19:38 +0000
committerTails developers <amnesia@boum.org>2014-07-31 08:19:38 +0000
commit70ac428f4c4fa99d8b20dc336982c335d6566137 (patch)
tree53be8aa31996ce55a4e46c368dab4329b91aa5fc /config/binary_local-hooks
parent855aeb24f9c4b70357d67cbb7af4bd6b00b4e602 (diff)
Disable runtime APT proxy configuration when using APT in binary_local-hooks (Closes: #7691).
If we don't do this, APT can't download lists from the Internet. And then, in some situations, it lacks the information needed to install dpkg-dev. I'm not sure why it can even work in some other cases, but in any case, this hook makes oh so much sense to me with this modification.
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem2
1 files changed, 2 insertions, 0 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 276ea0e..27a1cdd 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -43,11 +43,13 @@ 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 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 apt-get --yes purge dpkg-dev make # dpkg-dev depends on make