diff -r -u0 /usr/share/lorax/templates.d/80-rhel/appliance/libvirt.tmpl /usr/share/lorax/templates.d/99-generic/appliance/libvirt.tmpl
---/usr/share/lorax/templates.d/80-rhel/appliance/libvirt.tmpl
+++/usr/share/lorax/templates.d/99-generic/appliance/libvirt.tmpl
-%for disk, letter in zip(disks, xrange(97, 123)):
+%for disk, letter in zip(disks, range(97, 123)):
diff -r -u0 /usr/share/lorax/templates.d/80-rhel/arm.tmpl /usr/share/lorax/templates.d/99-generic/arm.tmpl
---/usr/share/lorax/templates.d/80-rhel/arm.tmpl
+++/usr/share/lorax/templates.d/99-generic/arm.tmpl
-<%page args="kernels, runtime_img, runtime_base, basearch, outroot, arch"/>
+<%page args="kernels, runtime_img, runtime_base, basearch, inroot, outroot, arch"/>
+import os
+from pylorax.sysutils import joinpaths
+
+# Test the runtime_img, if it is > 4GiB we need to set -iso-level to 3
+if os.stat(joinpaths(inroot, runtime_img)).st_size >= 4*1024**3:
+    isoargs = "-iso-level 3"
+else:
+    isoargs = ""
+<% efiargs=""; efigraft="" %>
+%if exists("boot/efi/EFI/*/gcdaa64.efi"):
+    <%
+    efiarch32 = ARM
+    efiarch64 = None
+    efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
+    images = ["images/efiboot.img"]
+    %>
+    %for img in images:
+        <%
+        efiargs += " -eltorito-alt-boot -e {0} -no-emul-boot".format(img)
+        efigraft += " {0}={1}/{0}".format(img,outroot)
+        %>
+        treeinfo images-${basearch} ${img|basename} ${img}
+    %endfor
+    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=efiarch32, efiarch64=efiarch64, isolabel=isolabel"/>
+%endif
+
-<% images=["product", "updates"] %>
+<% filegraft=""; images=["product", "updates"] %>
+        <% filegraft += " images/{0}.img={1}/images/{0}.img".format(img, outroot) %>
+# Inherit iso-graft/ if it exists from external templates
+<%
+    import os
+    if os.path.exists(workdir + "/iso-graft"):
+        filegraft += " " + workdir + "/iso-graft"
+%>
+
-%for f in glob("/usr/share/licenses/*-release/*"):
+%for f in glob("usr/share/licenses/*-release-common/*"):
+    <% filegraft += " {0}={1}/{0}".format(basename(f), outroot) %>
-## FIXME: ARM may need some extra boot config  +%if exists("boot/efi/EFI/*/gcdarm.efi"):
+## make boot.iso
+runcmd xorrisofs ${isoargs} -o ${outroot}/images/boot.iso +       ${efiargs} -R -J -V '${isolabel}' +       -graft-points +       .discinfo=${outroot}/.discinfo +       ${KERNELDIR}=${outroot}/${KERNELDIR} +       ${STAGE2IMG}=${outroot}/${STAGE2IMG} +       ${efigraft} ${filegraft}
+treeinfo images-${basearch} boot.iso images/boot.iso
+%endif
Only in /usr/share/lorax/templates.d/80-rhel/config_files/ppc: mapping
Only in /usr/share/lorax/templates.d/80-rhel/config_files/ppc: ofboot.b
Only in /usr/share/lorax/templates.d/80-rhel/config_files/ppc: yaboot.conf.3264
Only in /usr/share/lorax/templates.d/80-rhel/config_files/ppc: yaboot.conf.in
Only in /usr/share/lorax/templates.d/80-rhel/live/config_files/ppc: mapping
Only in /usr/share/lorax/templates.d/80-rhel/live/config_files/ppc: ofboot.b
Only in /usr/share/lorax/templates.d/80-rhel/live/config_files/ppc: yaboot.conf.3264
Only in /usr/share/lorax/templates.d/80-rhel/live/config_files/ppc: yaboot.conf.in
diff -r -u0 /usr/share/lorax/templates.d/80-rhel/live/live-install.tmpl /usr/share/lorax/templates.d/99-generic/live/live-install.tmpl
---/usr/share/lorax/templates.d/80-rhel/live/live-install.tmpl
+++/usr/share/lorax/templates.d/99-generic/live/live-install.tmpl
-%if basearch in ("ppc64le"):
+%if basearch == "ppc64le":
Only in /usr/share/lorax/templates.d/80-rhel/live: ppc.tmpl
Only in /usr/share/lorax/templates.d/80-rhel: ppc.tmpl