summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-25 22:37:04 +0000
committerintrigeri <intrigeri@boum.org>2016-05-25 22:37:04 +0000
commit526c55810ba447164f0308bb9fa1285145ad1877 (patch)
tree15bd15eb01487268996b29fb6883f0421b7bbf0d
parentee60691403a49daf4096dfff21f0f08837c36510 (diff)
Actually support the tagged snapshot format use.2.4-rc1
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem2
-rwxr-xr-xconfig/chroot_local-hooks/19-install-tor-browser-AppArmor-profile2
2 files changed, 2 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 b33f22c..195cefd 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -44,7 +44,7 @@ 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://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject/' \
+ '^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject(/|\s)' \
| grep --extended-regexp --invert-match \
'^deb\s+http://time-based\.snapshots\.deb\.tails\.boum.org/torproject/' \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \
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 ae39247..54a30cb 100755
--- a/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
+++ b/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
@@ -19,7 +19,7 @@ toggle_src_APT_sources() {
| grep --extended-regexp --line-regexp --invert-match \
'deb\s+file:/root/local-packages\s+\./' \
| grep --extended-regexp --invert-match \
- '^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject/' \
+ '^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject(/|\s)' \
| grep --extended-regexp --invert-match \
'^deb\s+http://time-based\.snapshots\.deb\.tails\.boum.org/torproject/' \
| sed --regexp-extended -e 's,^deb(\s+),deb-src\1,' \