summaryrefslogtreecommitdiffstats
path: root/config/binary_local-hooks
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-14 20:33:55 +0000
committerintrigeri <intrigeri@boum.org>2016-05-14 20:34:36 +0000
commit2bd1bdf752e9a706ef13a17ab4e2f93602c3a1ff (patch)
treefd5124811706334e1327300125f1981e37277f92 /config/binary_local-hooks
parent62b119a06cd89fbaaf241e8cff9d6332889924a9 (diff)
Fix regression in time-based snapshots, introduced when adding support for tagged snapshots.
Diffstat (limited to 'config/binary_local-hooks')
-rwxr-xr-xconfig/binary_local-hooks/40-include_syslinux_in_ISO_filesystem6
1 files changed, 4 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 bcf6797..b33f22c 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,10 @@ 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 --perl-regexp --invert-match \
- '^deb\s+http://(?:tagged|time-based)\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject/' \
+ | grep --extended-regexp --invert-match \
+ '^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject/' \
+ | 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,' \
> "$CHROOT_TEMP_APT_SOURCES"
Chroot chroot apt-get --yes update