summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud <arnaud@preev.io>2017-03-28 17:18:54 +0700
committeranonym <anonym@riseup.net>2017-04-03 11:33:37 +0200
commit6ca419178959ed264fee5b3fb622e464ecc5a8e4 (patch)
tree405313b140115945976db1d258098ad0d253509d
parenta1aa113b149ea0b83a9bd091361fdad84ae14412 (diff)
hooks: be more flexible when matching local packages in apt list file
Fix-committed: #12374
-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 195cefd..4a4d5d2 100755
--- a/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
+++ b/config/binary_local-hooks/40-include_syslinux_in_ISO_filesystem
@@ -41,8 +41,8 @@ cp "$CHROOT_SYSLINUX_BIN" "$LINUX_BINARY_UTILS_DIR/"
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 \
+ 'file:/root/local-packages' \
| grep --extended-regexp --invert-match \
'^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject(/|\s)' \
| grep --extended-regexp --invert-match \
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 54a30cb..3000bdc 100755
--- a/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
+++ b/config/chroot_local-hooks/19-install-tor-browser-AppArmor-profile
@@ -16,8 +16,8 @@ toggle_src_APT_sources() {
case "$MODE" in
on)
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 \
+ 'file:/root/local-packages' \
| grep --extended-regexp --invert-match \
'^deb\s+http://tagged\.snapshots\.deb\.tails\.boum.org/[^/]+/torproject(/|\s)' \
| grep --extended-regexp --invert-match \