[PATCH] Generate EFI-bootable CDs on x86 and x86_64.

["pjones" <pjones redhat com>]

Require a newer version of genisoimage that supports EFI booting, and
use it in mk-images.x86 when efiboot.img exists.
---
 anaconda.spec         |    3 ++-
 scripts/mk-images.x86 |    6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/anaconda.spec b/anaconda.spec
index 6de4f6b..6d47218 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # match the requires versions of things).
 %define dmver 1.02.17-6
 %define gettextver 0.11
+%define genisoimagever 1.1.9-4
 %define intltoolver 0.31.2-3
 %define libnlver 1.0
 %define libselinuxver 1.6
@@ -124,7 +125,7 @@ Requires: zenity
 %endif
 Requires: createrepo >= %{createrepover}
 Requires: squashfs-tools
-Requires: mkisofs
+Requires: genisoimage >= %{genisoimagever}
 %ifarch %{ix86} x86_64
 Requires: syslinux
 Requires: makebootfat
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86
index 3e22739..fd15459 100644
--- a/scripts/mk-images.x86
+++ b/scripts/mk-images.x86
@@ -157,7 +157,11 @@ __EOT__
 
 doPostImages() {
     if [ -n "$BOOTISO" ]; then
-       mkisofs -quiet -o $TOPDESTPATH/images/$BOOTISO -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img
+        EFIARGS=""
+        if [ -f isolinux/efiboot.img ]; then
+            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
        implantisomd5 $TOPDESTPATH/images/$BOOTISO
     fi
 
-- 
1.6.0.1