summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-14 16:37:26 +0000
committerintrigeri <intrigeri@boum.org>2016-05-14 18:52:10 +0000
commitc1745db0694c66447d4bec013efae217f4d337c2 (patch)
treed8b75c9ff5dde52f600221d429a0cd584a2046b1 /config
parent2d6a1f192ed5e67433bc61d82b3e191a899f17f0 (diff)
Don't try to temporarily enable deb-src for torproject from tagged APT snapshots either.
Diffstat (limited to 'config')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem4
-rwxr-xr-xconfig/chroot_local-hooks/19-install-tor-browser-AppArmor-profile4
2 files changed, 4 insertions, 4 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 97d139c..bcf6797 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -43,8 +43,8 @@ cp "$CHROOT_SYSLINUX_MBR" "$BINARY_MBR_DIR/mbr.bin"
cat chroot/etc/apt/sources.list chroot/etc/apt/sources.list.d/*.list \
| grep --extended-regexp --line-regexp --invert-match \
'deb\s+file:/root/local-packages\s+\./' \
- | grep --extended-regexp --invert-match \
- '^deb\s+http://time-based\.snapshots\.deb\.tails\.boum.org/torproject/' \
+ | grep --perl-regexp --invert-match \
+ '^deb\s+http://(?:tagged|time-based)\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject/' \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
> "$CHROOT_TEMP_APT_SOURCES"
Chroot chroot apt-get --yes update
diff --git a/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile b/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
index 6bf90d9..464f8a5 100755
--- a/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
+++ b/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
@@ -18,8 +18,8 @@ toggle_src_APT_sources() {
cat /etc/apt/sources.list /etc/apt/sources.list.d/*.list \
| grep --extended-regexp --line-regexp --invert-match \
'deb\s+file:/root/local-packages\s+\./' \
- | grep --extended-regexp --invert-match \
- '^deb\s+http://time-based\.snapshots\.deb\.tails\.boum.org/torproject/' \
+ | grep --perl-regexp --invert-match \
+ '^deb\s+http://(?:tagged|time-based)\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject/' \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
> "$TEMP_APT_SOURCES"
;;