Skip to content

GitLab

Commit fdc87dc2 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'feature/8100-linux-3.16.5-1' into testing

parents ac0ba7d2 98801ab3
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
auto/config
View file @ fdc87dc2
......@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
--memtest none \
--packages-lists="standard" \
--tasks="standard" \
--linux-packages="linux-image-3.16-2" \
--linux-packages="linux-image-3.16-3" \
--syslinux-menu vesamenu \
--syslinux-splash data/splash.png \
--syslinux-timeout 4 \
......
config/chroot_apt/preferences
View file @ fdc87dc2
......@@ -126,19 +126,19 @@ Package: linux-headers-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-2-common
Package: linux-headers-3.16-3-common
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-2-486
Package: linux-headers-3.16-3-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-2-686-pae
Package: linux-headers-3.16-3-686-pae
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-2-amd64
Package: linux-headers-3.16-3-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -154,15 +154,15 @@ Package: linux-image-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.16-2-486
Package: linux-image-3.16-3-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.16-2-686-pae
Package: linux-image-3.16-3-686-pae
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.16-2-amd64
Package: linux-image-3.16-3-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment