[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Conditionalize use of UEFI on boot.iso



On Tue, 2010-12-14 at 16:00 -0500, Peter Jones wrote:
> This conditionalizes adding support for UEFI when creating boot.iso
> ---
>  scripts/mk-images     |    8 +++++---
>  scripts/mk-images.x86 |    3 ++-
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/mk-images b/scripts/mk-images
> index e9a44d7..7d842f4 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"

Didn't you mean "yes" ?

> +    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 d8fb867..20aef71 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"

-- 
Martin Gracik <mgracik redhat com>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]