diff options
| author | Tails developers <amnesia@boum.org> | 2015-01-19 10:18:01 +0000 |
|---|---|---|
| committer | Tails developers <amnesia@boum.org> | 2015-01-19 10:52:27 +0000 |
| commit | 716fd0b719c6099285488577e65992fd26cacf6b (patch) | |
| tree | cda1548500143cdf25db820e108c7d87da7faa2c /config/binary_local-hooks | |
| parent | ecb7555567e13fd3800e03d50f711bac3cd7ad5c (diff) | |
Switch to tor+http:// APT sources at boot time instead of at build time (Will-Fix: #8715).
live-build expects to be the only one that manages APT sources.
Since feature/8194-APT-socks was merged, we're breaking this assumption of its,
by mangling APT sources under live-build's feet via chroot_local-hooks.
More specifically, if:
* $LB_MIRROR_CHROOT != $LB_MIRROR_BINARY or
$LB_MIRROR_CHROOT_SECURITY != $LB_MIRROR_BINARY_SECURITY,
as is the case when building with Vagrant or when following our manual
build setup instructions accurately (live-build defaults to
ftp.de.debian.org for some of its APT configuration),
or:
* one has dropped .deb's in config/chroot_local-packages, as contributors
without write access to our APT repository may want to do,
then after completing the chroot_local-hooks stage, lb_chroot_sources would
rewrite APT sources to match what we have previously configured (see the check
at lines 490-498 in live-build 2.x tree), and therefore the ISO image would have
http:// URLs configured instead of the expected tor+http://.
Therefore, let's mangle APT sources configuration at boot time instead.
Diffstat (limited to 'config/binary_local-hooks')
| -rwxr-xr-x | config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem | 2 |
1 files changed, 0 insertions, 2 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 8fc75e1..e79fb91 100755 --- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem +++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem @@ -43,12 +43,10 @@ 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" -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" -Chroot chroot /usr/local/lib/apt-toggle-tor-http on Chroot chroot apt-get --yes purge dpkg-dev make # dpkg-dev depends on make |