[PATCH] Make sure that efiboot.img exists in isolinux/ .

["pjones" <pjones redhat com>]

Since the data must be on the CD for the CD to be bootable, put the data
on the CD.
---
 scripts/mk-images.efi |    2 +-
 scripts/mk-images.x86 |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/mk-images.efi b/scripts/mk-images.efi
index 687d76c..44bc315 100644
--- a/scripts/mk-images.efi
+++ b/scripts/mk-images.efi
@@ -182,7 +182,7 @@ makeEfiImages() {
             echo "cannot find package grub.$grubarch" >&2
             return 1
         fi
-        echo "Building efiboot.img for ${efiarch}/$KERNELARCH at $TOPDESTPATH/images/efiboot.img"
+        echo "Building efiboot.img for ${efiarch}/$KERNELARCH at $TOPDESTPATH/images/pxeboot/efiboot.img"
 
         makeefibootimage \
             --imagename pxeboot/efiboot.img \
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 1a77b6e..713eb66 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -158,7 +158,9 @@ __EOT__
 doPostImages() {
     if [ -n "$BOOTISO" ]; then
         EFIARGS=""
-        if [ -f isolinux/efiboot.img ]; then
+        if [ -f $TOPDESTPATH/images/pxelinux/efiboot.img ]; then
+            cp -av $TOPDESTPATH/images/pxelinux/efiboot.img \
+                   $TOPDESTPATH/isolinux/efiboot.img
             EFIARGS="-eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot"
         fi
         mkisofs -quiet -o $TOPDESTPATH/images/$BOOTISO -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img
-- 
1.6.0.1