From 99588ad172ad46cf1c66914ffe5a51e25d93f74d Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Tue, 8 Nov 2016 21:29:55 +0100
Subject: [PATCH] version up: slapos.recipe.build 0.28

---
 component/qemu-kvm/buildout.cfg               | 10 +++++++
 component/vm-img/debian.cfg                   | 27 ++++++++++++++++++-
 .../software.cfg                              |  2 +-
 stack/slapos.cfg                              |  2 +-
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/component/qemu-kvm/buildout.cfg b/component/qemu-kvm/buildout.cfg
index 4bfab48e0..212c12d5b 100644
--- a/component/qemu-kvm/buildout.cfg
+++ b/component/qemu-kvm/buildout.cfg
@@ -58,6 +58,16 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
 <= debian-netinst-base
 arch = amd64
 
+[debian-amd64-squeeze-netinst.iso]
+<= debian-amd64-netinst-base
+version = 6.0.10
+md5sum = 7f82d341561035f65933da43f94d5b52
+
+[debian-amd64-wheezy-netinst.iso]
+<= debian-amd64-netinst-base
+version = 7.11.0
+md5sum = 096c1c18b44c269808bd815d58c53c8f
+
 [debian-amd64-netinst.iso]
 # Download the installer of Debian 8 (Jessie)
 <= debian-amd64-netinst-base
diff --git a/component/vm-img/debian.cfg b/component/vm-img/debian.cfg
index 253a81e77..f7ba8c841 100644
--- a/component/vm-img/debian.cfg
+++ b/component/vm-img/debian.cfg
@@ -29,13 +29,38 @@ late-command =
 # a DNS proxy on both IPv4 and IPv6 without translating queries to what the
 # host supports.
   dpkg -P rdnssd
+  [ $DIST != debian-squeeze ] || {
+# Squeeze kernel (2.6.32) is too old for 9p mount points.
+    set squeeze-backports /etc/apt/sources.list.d/backports.list `
+      aptitude -F %p search '?source-package("^linux-latest-2.6$")~i'`
+    echo 'Acquire::Check-Valid-Until "false";' >/etc/apt/apt.conf.d/00AcceptExpired
+    echo deb http://archive.debian.org/debian-backports/ $1 main >$2
+    apt-get update --no-list-cleanup -o Dir::Etc::SourceList=/dev/null
+    apt-get install -y -t $1 $3
+  }
+  mount |grep -q 'on / .*\bdiscard\b' || ! type fstrim || {
+    apt-get clean
+    sync
+    fstrim -v /
+  }
 debconf.debconf =
   debconf/frontend noninteractive
   debconf/priority critical
+debian-squeeze/preseed.mirror/country = manual
+debian-squeeze/preseed.mirror/http/hostname = archive.debian.org
+debian-squeeze/preseed.mirror/http/directory = /debian
 # minimal size
+preseed.apt-setup/enable-source-repositories = false
 preseed.recommends = false
 preseed.tasks =
-packages = localepurge
+
+[debian-squeeze]
+<= debian-jessie
+x86_64.iso = debian-amd64-squeeze-netinst.iso
+
+[debian-wheezy]
+<= debian-jessie
+x86_64.iso = debian-amd64-wheezy-netinst.iso
 
 [debian-jessie]
 x86_64.iso = debian-amd64-netinst.iso
diff --git a/software/test-slave-instance-deployment/software.cfg b/software/test-slave-instance-deployment/software.cfg
index 44ca88649..b05218a0f 100644
--- a/software/test-slave-instance-deployment/software.cfg
+++ b/software/test-slave-instance-deployment/software.cfg
@@ -58,7 +58,7 @@ eggs = collective.recipe.template
 [versions]
 collective.recipe.template = 1.11
 plone.recipe.command = 1.1
-slapos.recipe.build = 0.27
+slapos.recipe.build = 0.28
 slapos.recipe.template = 2.7
 
 # Replicate slapos stack, but without shacache to not have to compile the entire world for a simple test.
diff --git a/stack/slapos.cfg b/stack/slapos.cfg
index d459250c6..b037d8a65 100644
--- a/stack/slapos.cfg
+++ b/stack/slapos.cfg
@@ -137,7 +137,7 @@ slapos.cookbook = 1.0.41
 slapos.core = 1.3.18
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5
-slapos.recipe.build = 0.27
+slapos.recipe.build = 0.28
 slapos.recipe.cmmi = 0.2
 stevedore = 1.18.0
 unicodecsv = 0.14.1
-- 
2.30.9