From 133addd59014eac6af834e000ea0415eab29405f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 16 Jul 2015 15:58:16 +0200
Subject: [PATCH] live-build/ubuntu-core/hooks/16-ensure-uboot.chroot: we need
 to go into redundEnv mode to get the 5byte header that uboot uses by default,
 don't ask why

---
 live-build/ubuntu-core/hooks/16-ensure-uboot.chroot | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index 72b7e2f4..655da6f3 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -6,6 +6,13 @@ if [ "$(dpkg --print-architecture)" = "armhf" ]; then
     mkdir -p /boot/uboot
     cat > /etc/fw_env.config <<EOF
 # snappy u-boot env config
-/boot/uboot/uboot.env 0x0000 0x4000
+# its crucial that we have the two entries here
+#   u-boot/tools/env/fw_env.c 
+# will read only 4 header bytes if its a single
+# line but our header has 5 byte. by having two
+# entries like this in the config it magically
+# switches to the 5 byte header type
+/boot/uboot/uboot.env 0x0000 0x20000
+/boot/uboot/uboot.env 0x0000 0x20000
 EOF
 fi