From 9df3348a7113f3d5b4bb05624080a06d6575b95d Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Tue, 11 Oct 2011 14:58:30 -0400
Subject: [PATCH] Move images/install.img to LiveOS/squashfs.img (#732298)

Since pungi doesn't know that images/install.img needs to be moved to
LiveOS/squashfs.img for images to be "live", they aren't bootable.

This is the simple solution to the problem. Thanks to Karsten Hopp
for the original patch.
---
 share/ppc.tmpl   | 7 ++++---
 share/sparc.tmpl | 9 +++++----
 share/x86.tmpl   | 7 ++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index f0d535de..2c487917 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -2,6 +2,7 @@
 <%
 configdir="tmp/config_files"
 BOOTDIR="ppc"
+LIVEDIR="LiveOS"
 MACDIR=BOOTDIR+"/mac"
 NETBOOTDIR="images/netboot"
 
@@ -12,8 +13,8 @@ bitsizes = set()
 prepboot = ""
 %>
 
-mkdir images
-install ${runtime_img} images/install.img
+mkdir ${LIVEDIR}
+install ${runtime_img} ${LIVEDIR}/squashfs.img
 
 ## basic ppc stuff
 mkdir ${BOOTDIR}
@@ -82,7 +83,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
         etc=${outroot}/etc \
         ${BOOTDIR}=${outroot}/${BOOTDIR} \
         ${NETBOOTDIR}=${outroot}/${NETBOOTDIR} \
-        LiveOS/squashfs.img=${outroot}/images/install.img
+        ${LIVEDIR}=${outroot}/${LIVEDIR}
 
 %if len(bitsizes) == 2:
     treeinfo images-ppc   boot.iso images/boot.iso
diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index abd7e2ba..a58f18e4 100644
--- a/share/sparc.tmpl
+++ b/share/sparc.tmpl
@@ -2,10 +2,11 @@
 <%
 configdir="tmp/config_files"
 BOOTDIR="boot"
+LIVEDIR="LiveOS"
 %>
 
-mkdir images
-install ${runtime_img} images/install.img
+mkdir ${LIVEDIR}
+install ${runtime_img} ${LIVEDIR}/squashfs.img
 
 install boot/*.b ${BOOTDIR}
 install ${configdir}/silo.conf ${BOOTDIR}
@@ -27,6 +28,6 @@ runcmd mkisofs -R -J -T -G /${BOOTDIR}/isofs.b -B ... \
   -x Fedora -x repodata \
   -sparc-label "${product.name} ${product.version} Boot Disc" \
   -o ${outroot}/images/boot.iso \
-  -graft-points boot=${outroot}/${BOOTDIR} \
-                LiveOS/squashfs.img=${outroot}/images/install.img
+  -graft-points ${BOOTDIR}=${outroot}/${BOOTDIR} \
+                ${LIVEDIR}=${outroot}/${LIVEDIR}
 treeinfo images-${basearch} boot.iso images/boot.iso
diff --git a/share/x86.tmpl b/share/x86.tmpl
index 600fa567..298fa6cb 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -5,10 +5,11 @@ SYSLINUXDIR="usr/share/syslinux"
 PXEBOOTDIR="images/pxeboot"
 BOOTDIR="isolinux"
 KERNELDIR=PXEBOOTDIR
+LIVEDIR="LiveOS"
 %>
 
-mkdir images
-install ${runtime_img} images/install.img
+mkdir ${LIVEDIR}
+install ${runtime_img} ${LIVEDIR}/squashfs.img
 
 mkdir ${BOOTDIR} ${KERNELDIR}
 install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
@@ -66,7 +67,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso \
        ${efiargs} -R -J -V '${product.name}' -T -graft-points \
        ${BOOTDIR}=${outroot}/${BOOTDIR} \
        ${KERNELDIR}=${outroot}/${KERNELDIR} \
-       LiveOS/squashfs.img=${outroot}/images/install.img \
+       ${LIVEDIR}=${outroot}/${LIVEDIR} \
        ${efigraft}
 runcmd isohybrid ${efihybrid} ${outroot}/images/boot.iso
 treeinfo images-${basearch} boot.iso images/boot.iso