From 5eb6c9b12f82124a06be651b732411c39a331157 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Wed, 22 Jun 2011 20:22:24 -0400
Subject: [PATCH] arch templates: install runtime to /images/, put it on
 boot.iso

make sure the arch templates (s390 excluded) copy the runtime image in
to the /images/ dir, and make sure it gets grafted/copied into the
boot.iso.
---
 share/ppc.tmpl   | 4 ++++
 share/s390.tmpl  | 3 +++
 share/sparc.tmpl | 6 +++++-
 share/x86.tmpl   | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/share/ppc.tmpl b/share/ppc.tmpl
index c6302f30..8ec2946c 100644
--- a/share/ppc.tmpl
+++ b/share/ppc.tmpl
@@ -15,6 +15,9 @@ prepboot = ""
 macboot = ""
 %>
 
+mkdir images
+install ${runtime} images
+
 mkdir ${BOOTDIR} ${BOOTDIR}/chrp etc
 install ${ANABOOTDIR}/bootinfo.txt ${BOOTDIR}
 install boot/efika.forth ${BOOTDIR}
@@ -84,6 +87,7 @@ runcmd usr/lib/yaboot/addnote ${outroot}/${BOOTDIR}/chrp/yaboot
 mkdir isopath
 copy ${BOOTDIR} isopath
 copy etc isopath
+copy images isopath
 runcmd mkisofs -o ${outroot}/images/boot.iso -chrp-boot -U \
         ${prepboot} -part -hfs -T -r -l -J \
         -A "${product.name} ${product.version}" -sysid PPC -V "PBOOT" \
diff --git a/share/s390.tmpl b/share/s390.tmpl
index 533a7b2b..c58f8d46 100644
--- a/share/s390.tmpl
+++ b/share/s390.tmpl
@@ -8,6 +8,9 @@ MKCDBOOT="usr/libexec/anaconda/mk-s390-cdboot"
 kernel = kernels[0]
 %>
 
+mkdir images
+install ${runtime} images
+
 install ${ANABOOTDIR}/redhat.exec ${BOOTDIR}
 install ${ANABOOTDIR}/generic.prm ${BOOTDIR}
 install ${ANABOOTDIR}/generic.ins .
diff --git a/share/sparc.tmpl b/share/sparc.tmpl
index dc4cc6ab..faeff017 100644
--- a/share/sparc.tmpl
+++ b/share/sparc.tmpl
@@ -4,6 +4,9 @@ BOOTDIR="boot"
 KERNELDIR=BOOTDIR
 %>
 
+mkdir images
+install ${runtime} images
+
 install boot/*.b ${BOOTDIR}
 install ${ANABOOTDIR}/silo.conf ${BOOTDIR}
 install ${ANABOOTDIR}/boot.msg ${BOOTDIR}/boot.msg
@@ -22,5 +25,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=${BOOTDIR}
+  -graft-points boot=${outroot}/${BOOTDIR} \
+                ${runtime}=${outroot}/${runtime}
 treeinfo images-${basearch} boot.iso images/boot.iso
diff --git a/share/x86.tmpl b/share/x86.tmpl
index af6e7f4b..c43a9787 100644
--- a/share/x86.tmpl
+++ b/share/x86.tmpl
@@ -6,6 +6,9 @@ BOOTDIR="isolinux"
 KERNELDIR=PXEBOOTDIR
 %>
 
+mkdir images
+install ${runtime} images
+
 mkdir ${BOOTDIR} ${KERNELDIR}
 install ${SYSLINUXDIR}/isolinux.bin ${BOOTDIR}
 install ${ANABOOTDIR}/syslinux.cfg ${BOOTDIR}/isolinux.cfg
@@ -63,6 +66,7 @@ runcmd mkisofs -o ${outroot}/images/boot.iso \
        ${efiargs} -R -J -V '${product.name}' -T -graft-points \
        ${BOOTDIR}=${outroot}/${BOOTDIR} \
        ${KERNELDIR}=${outroot}/${KERNELDIR} \
+       ${runtime}=${outroot}/${runtime} \
        ${efigraft}
 runcmd isohybrid ${outroot}/images/boot.iso
 treeinfo images-${basearch} boot.iso images/boot.iso