diff options
| author | Peter Jones <pjones@redhat.com> | 2010-03-31 16:57:39 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2011-01-14 15:05:42 -0500 |
| commit | 257effe6a557fd7695b86d62cfd3e8a62fae7ce7 (patch) | |
| tree | f819e5ff750276fec8fb768d1452f710711038b2 /scripts | |
| parent | 572feb93049711f9edcd0b53c82f16286d91e6a9 (diff) | |
| download | anaconda-257effe6a557fd7695b86d62cfd3e8a62fae7ce7.tar.gz anaconda-257effe6a557fd7695b86d62cfd3e8a62fae7ce7.tar.xz anaconda-257effe6a557fd7695b86d62cfd3e8a62fae7ce7.zip | |
Conditionalize use of UEFI on boot.iso
This conditionalizes adding support for UEFI when creating boot.iso
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 8 | ||||
| -rw-r--r-- | scripts/mk-images.x86 | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index e9a44d7d8..7d842f420 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -447,10 +447,12 @@ if [ ${BUILDARCH} = s390x ]; then elif [ ${BUILDARCH} = ppc64 ]; then # ... and similar for ppc64 source $TOPDIR/mk-images.ppc -elif [ ${BUILDARCH} = "x86_64" -o ${BUILDARCH} = "i386" ]; then +elif [ ${BUILDARCH} = "x86_64" ]; then + export UEFI_BOOT_ISO="no" + source $TOPDIR/mk-images.x86 + source $TOPDIR/mk-images.efi +elif [ ${BUILDARCH} = "i386" ]; then source $TOPDIR/mk-images.x86 - # Only generate EFI images on 64bit - test ${BUILDARCH} = "x86_64" && source $TOPDIR/mk-images.efi elif [ ${BUILDARCH} = "sparc64" -o ${BUILDARCH} = "sparcv9" ]; then source $TOPDIR/mk-images.sparc else diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index d8fb8675d..20aef710d 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -142,7 +142,8 @@ doPostImages() { if [ -n "$BOOTISO" ]; then EFIARGS="" EFIGRAFT="" - if [ -f $TOPDESTPATH/images/efiboot.img ]; then + if [ $UEFI_BOOT_ISO = "yes" -a \ + -f $TOPDESTPATH/images/efiboot.img ]; then echo "Found efiboot.img, making an EFI-capable boot.iso" EFIARGS="-eltorito-alt-boot -e images/efiboot.img -no-emul-boot" EFIGRAFT="EFI/BOOT=$TOPDESTPATH/EFI/BOOT" |