summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2017-03-05 14:08:05 +0000
committerintrigeri <intrigeri@boum.org>2017-03-05 14:08:05 +0000
commitf95a8ea01d1fac27eddbf2720fbea0c472550199 (patch)
treed7f2203a9b683f1187944f1584bcd809d61b5c89 /config
parentee8b2883b45b03ee9a5f7ed475fbb6bb297dbb82 (diff)
parentd484e0362736a97e2c2b57fa5218115660f0131a (diff)
Merge remote-tracking branch 'origin/bugfix/12217-linux-4.8.15' into stable (fix-committed: #12217)
Diffstat (limited to 'config')
-rw-r--r--config/APT_overlays.d/bugfix-12217-linux-4.8.150
-rw-r--r--config/chroot_apt/preferences15
2 files changed, 10 insertions, 5 deletions
diff --git a/config/APT_overlays.d/bugfix-12217-linux-4.8.15 b/config/APT_overlays.d/bugfix-12217-linux-4.8.15
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/config/APT_overlays.d/bugfix-12217-linux-4.8.15
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 7791fb4..fb9166f 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -88,24 +88,29 @@ Package: linux-base
Pin: release o=Debian,n=sid
Pin-Priority: 999
+Explanation: freeze exception added for Tails 2.11
Package: linux-compiler-gcc-*
-Pin: release o=Debian,n=jessie-backports
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Explanation: freeze exception added for Tails 2.11
Package: linux-compiler-gcc-*:amd64
-Pin: release o=Debian,n=jessie-backports
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Explanation: freeze exception added for Tails 2.11
Package: linux-headers-* linux-headers-*:amd64
-Pin: release o=Debian,n=jessie-backports
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Explanation: freeze exception added for Tails 2.11
Package: linux-image-*-unsigned linux-image-*-unsigned:amd64
-Pin: release o=Debian,n=jessie-backports
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
+Explanation: freeze exception added for Tails 2.11
Package: linux-kbuild-* linux-source-*
-Pin: release o=Debian,n=jessie-backports
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
Package: monkeysphere