From 142b23b64ee232237ddab6cf2ce3bd03b6ab6d6c Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Thu, 6 Nov 2014 09:16:49 -0800
Subject: [PATCH] Add product.img support for arm templates

---
 share/arm.tmpl      | 8 ++++++++
 share/live/arm.tmpl | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/share/arm.tmpl b/share/arm.tmpl
index e2798b95..26ce9906 100644
--- a/share/arm.tmpl
+++ b/share/arm.tmpl
@@ -6,6 +6,7 @@ DTBDIR="images/pxeboot/dtb"
 BOOTDIR="boot"
 KERNELDIR=PXEBOOTDIR
 LIVEDIR="LiveOS"
+LORAXDIR="usr/share/lorax/"
 
 # different platforms use different kernel load addresses.
 # include a 'baseline' kernel for no 'flavor'.
@@ -114,6 +115,13 @@ mkdir ${KERNELDIR}
 # add platform to treeinfo for Beaker support
 treeinfo ${basearch} platforms ${platforms}
 
+# Create optional product.img and updates.img
+<% images=["product", "updates"] %>
+%for img in images:
+    %if exists("%s/%s/" % (LORAXDIR, img)):
+        installimg ${LORAXDIR}/${img}/ images/${img}.img
+    %endif
+%endfor
 
 ## FIXME: ARM may need some extra boot config
 
diff --git a/share/live/arm.tmpl b/share/live/arm.tmpl
index 4c41d51c..4b0cd82c 100644
--- a/share/live/arm.tmpl
+++ b/share/live/arm.tmpl
@@ -5,6 +5,7 @@ PXEBOOTDIR="images/pxeboot"
 BOOTDIR="boot"
 KERNELDIR=PXEBOOTDIR
 LIVEDIR="LiveOS"
+LORAXDIR="usr/share/lorax/"
 
 # different platforms use different kernel load addresses.
 # include a 'baseline' kernel for no 'flavor'.
@@ -69,6 +70,13 @@ mkdir ${KERNELDIR}
     %endif
 %endfor
 
+# Create optional product.img and updates.img
+<% images=["product", "updates"] %>
+%for img in images:
+    %if exists("%s/%s/" % (LORAXDIR, img)):
+        installimg ${LORAXDIR}/${img}/ images/${img}.img
+    %endif
+%endfor
 
 ## FIXME: ARM may need some extra boot config