diff options
| author | intrigeri <intrigeri@boum.org> | 2016-05-14 12:30:04 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-05-14 12:30:04 +0000 |
| commit | 806f6f1a763e53a22f4c28f5744f938bbddc8671 (patch) | |
| tree | 7e659d9deba94c4ea859dda5cf5f4a914a95e3be /config/chroot_local-includes | |
| parent | 5243e649cb0736c77d7da7051999235f94a1754c (diff) | |
| parent | 9e2df21298d89f9373ccfc23cd44320962ba7530 (diff) | |
Merge remote-tracking branch 'origin/devel' into feature/10951-remove-kernel-map-files
Diffstat (limited to 'config/chroot_local-includes')
| -rwxr-xr-x | config/chroot_local-includes/lib/live/config/1600-undivert-APT | 8 | ||||
| -rw-r--r-- | config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config/chroot_local-includes/lib/live/config/1600-undivert-APT b/config/chroot_local-includes/lib/live/config/1600-undivert-APT new file mode 100755 index 0000000..93f8b53 --- /dev/null +++ b/config/chroot_local-includes/lib/live/config/1600-undivert-APT @@ -0,0 +1,8 @@ +#!/bin/sh + +echo "- undiverting APT" + +if [ -f /usr/bin/apt-get.real ]; then + rm -f usr/bin/apt-get + dpkg-divert --rename --remove /usr/bin/apt-get +fi diff --git a/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes b/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes index 20eb37a..87b68e9 100644 --- a/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes +++ b/config/chroot_local-includes/usr/share/amnesia/build/mksquashfs-excludes @@ -1,6 +1,7 @@ boot/initrd.img-* boot/vmlinux-* boot/vmlinuz-* +debootstrap/* tmp/* usr/share/amnesia/packages/* usr/share/doc/tails/website/blueprint/* |