diff options
| author | intrigeri <intrigeri@boum.org> | 2016-05-14 20:33:55 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-05-14 20:34:36 +0000 |
| commit | 2bd1bdf752e9a706ef13a17ab4e2f93602c3a1ff (patch) | |
| tree | fd5124811706334e1327300125f1981e37277f92 /config | |
| parent | 62b119a06cd89fbaaf241e8cff9d6332889924a9 (diff) | |
Fix regression in time-based snapshots, introduced when adding support for tagged snapshots.
Diffstat (limited to 'config')
| -rwxr-xr-x | config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem | 6 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile | 6 |
2 files changed, 8 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 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 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 464f8a5..ae39247 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,10 @@ 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 --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,' \ > "$TEMP_APT_SOURCES" ;; |