diff options
| author | intrigeri <intrigeri@boum.org> | 2015-12-13 16:17:43 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2015-12-13 16:17:43 +0000 |
| commit | 63e53cc20a03cdb6f7084efb2be7289cc73bf5e7 (patch) | |
| tree | b559940402c5d86ab70fe13bc156b3894c606cd1 /config | |
| parent | 4ab27926b313664a51d49fe61ac80c4896bbce30 (diff) | |
| parent | 2392e8c15c629d2529f3c5b415a83aa50e439757 (diff) | |
Merge remote-tracking branch 'kibi/pu/stable-v1' into feature/5926-freezable-APT-repository
Diffstat (limited to 'config')
| -rw-r--r-- | config/chroot_apt/preferences | 4 | ||||
| -rwxr-xr-x | config/chroot_local-includes/lib/live/config/1600-undivert-APT | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences index f9b0c05..2739d04 100644 --- a/config/chroot_apt/preferences +++ b/config/chroot_apt/preferences @@ -222,6 +222,10 @@ Package: monkeysign Pin: release o=Debian Backports,n=wheezy-backports Pin-Priority: 999 +Package: monkeysphere +Pin: release o=Debian,n=stretch +Pin-Priority: 999 + Package: obfs4proxy Pin: release o=TorProject,n=obfs4proxy Pin-Priority: 990 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..fafa04c --- /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 |