From 88dea355b98a522ef459058d85b20637dff427d2 Mon Sep 17 00:00:00 2001
From: Stefan Scherer <scherer_stefan@icloud.com>
Date: Tue, 27 Mar 2018 09:14:53 +0200
Subject: [PATCH 1/2] Remove -x

---
 builder/files/var/lib/cloud/scripts/per-once/resize2fs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/builder/files/var/lib/cloud/scripts/per-once/resize2fs b/builder/files/var/lib/cloud/scripts/per-once/resize2fs
index 3977277..f581ce7 100755
--- a/builder/files/var/lib/cloud/scripts/per-once/resize2fs
+++ b/builder/files/var/lib/cloud/scripts/per-once/resize2fs
@@ -1,5 +1,7 @@
 #!/bin/bash
-set -ex
+set -e
+
+echo "Resizing root file system"
 
 if ! [ -h /dev/disk/by-label/root ]; then
   echo "/dev/disk/by-label/root does not exist or is not a symlink. Don't know how to expand"

From f43150ded6d7b2dc2586287108cf259f12a23b1b Mon Sep 17 00:00:00 2001
From: Stefan Scherer <scherer_stefan@icloud.com>
Date: Tue, 27 Mar 2018 09:15:14 +0200
Subject: [PATCH 2/2] Use fixed 4.9.80 kernel release

---
 versions.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions.config b/versions.config
index fd23228..4fee841 100644
--- a/versions.config
+++ b/versions.config
@@ -8,7 +8,7 @@ RAW_IMAGE_VERSION="v0.2.2"
 RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1c2c6"
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_BUILD="20180321-214849"
+export KERNEL_BUILD="20180327-070923"
 # For testing a new kernel, use the CircleCI artifacts URL.
 # export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
 export KERNEL_VERSION="4.9.80"