summaryrefslogtreecommitdiffstats
path: root/auto
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2014-12-03 13:01:52 +0100
committerTails developers <amnesia@boum.org>2014-12-03 13:01:52 +0100
commit1138ffbed4936969f0068ad29aeefb7b1bcb7697 (patch)
tree0c5e2a39fb2863125984321a8f4e0c717e3d1644 /auto
parent56c42191c0620c45c7659cce16b564467bb80759 (diff)
parent7999371f600097af34fe489d80a8eb253fe5778c (diff)
Merge https://git-tails.immerda.ch/tails into doc/projectdoc/projectdoc/7536-project
Diffstat (limited to 'auto')
-rwxr-xr-xauto/build2
-rwxr-xr-xauto/config2
2 files changed, 2 insertions, 2 deletions
diff --git a/auto/build b/auto/build
index d9c1410..e94edbc 100755
--- a/auto/build
+++ b/auto/build
@@ -65,7 +65,7 @@ chmod -R go+rX config/chroot_sources
# build the image
-: ${MKSQUASHFS_OPTIONS:='-comp xz'}
+: ${MKSQUASHFS_OPTIONS:='-comp xz -Xbcj x86 -b 1024K -Xdict-size 1024K'}
MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -wildcards -ef chroot/usr/share/amnesia/build/mksquashfs-excludes"
export MKSQUASHFS_OPTIONS
diff --git a/auto/config b/auto/config
index f614c9b..022b883 100755
--- a/auto/config
+++ b/auto/config
@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
--memtest none \
--packages-lists="standard" \
--tasks="standard" \
- --linux-packages="linux-image-3.14-1" \
+ --linux-packages="linux-image-3.16-3" \
--syslinux-menu vesamenu \
--syslinux-splash data/splash.png \
--syslinux-timeout 4 \