We're not supporting UEFI on non-64-bit x86 machines in RHEL-6, so don't make media that tries to support that. This patch also conditionalizes the use of UEFI on boot.iso, and turns it off so that boot.iso can be used as a fallback since disc1 is UEFI enabled. --- scripts/mk-images | 5 ++++- scripts/mk-images.x86 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images index 9e5a94d..329389d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -1007,9 +1007,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 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 721e4fd..985e758 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -153,7 +153,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"
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On Wed, 31 Mar 2010, Peter Jones wrote:
We're not supporting UEFI on non-64-bit x86 machines in RHEL-6, so don't make media that tries to support that. This patch also conditionalizes the use of UEFI on boot.iso, and turns it off so that boot.iso can be used as a fallback since disc1 is UEFI enabled.
scripts/mk-images | 5 ++++- scripts/mk-images.x86 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images index 9e5a94d..329389d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -1007,9 +1007,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"
Shouldn't this be: export UEFI_BOOT_ISO="yes"
Per the patch comment and the test below?
source $TOPDIR/mk-images.x86 source $TOPDIR/mk-images.efi+elif [ ${BUILDARCH} = "i386" ]; then
- source $TOPDIR/mk-images.x86
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 721e4fd..985e758 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -153,7 +153,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"
- -- David Cantrell dcantrell@redhat.com Red Hat / Honolulu, HI
On 03/31/2010 07:35 PM, David Cantrell wrote:
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On Wed, 31 Mar 2010, Peter Jones wrote:
We're not supporting UEFI on non-64-bit x86 machines in RHEL-6, so don't make media that tries to support that. This patch also conditionalizes the use of UEFI on boot.iso, and turns it off so that boot.iso can be used as a fallback since disc1 is UEFI enabled.
scripts/mk-images | 5 ++++- scripts/mk-images.x86 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images index 9e5a94d..329389d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -1007,9 +1007,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"
Shouldn't this be: export UEFI_BOOT_ISO="yes"
Per the patch comment and the test below?
Maybe I should revise the comment some to make it more clear - we're not making anything UEFI bootable on i386, because we're not supporting that, and we're turning off boot.iso being UEFI bootable on /x86_64/, so it can be used as a fallback if you've got hardware that you're trying to install a BIOS-booted OS on, but on which that won't work for whatever reason if the CD has UEFI boot info.
We're not supporting UEFI on non-64-bit x86 machines in RHEL-6, so don't make media that tries to support that.
This patch also conditionalizes the use of UEFI on boot.iso, and turns it off on 64-bit machines, so that boot.iso can be used as a fallback since disc1 is UEFI enabled. --- scripts/mk-images | 5 ++++- scripts/mk-images.x86 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images index 9e5a94d..329389d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -1007,9 +1007,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 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 721e4fd..985e758 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -153,7 +153,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"
Bueller? Bueller?
On 04/09/2010 04:15 PM, Peter Jones wrote:
We're not supporting UEFI on non-64-bit x86 machines in RHEL-6, so don't make media that tries to support that.
This patch also conditionalizes the use of UEFI on boot.iso, and turns it off on 64-bit machines, so that boot.iso can be used as a fallback since disc1 is UEFI enabled.
scripts/mk-images | 5 ++++- scripts/mk-images.x86 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images index 9e5a94d..329389d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -1007,9 +1007,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
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 721e4fd..985e758 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -153,7 +153,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"
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Yes, ack. Ack.
On Wed, 14 Apr 2010, Peter Jones wrote:
Bueller? Bueller?
On 04/09/2010 04:15 PM, Peter Jones wrote:
We're not supporting UEFI on non-64-bit x86 machines in RHEL-6, so don't make media that tries to support that.
This patch also conditionalizes the use of UEFI on boot.iso, and turns it off on 64-bit machines, so that boot.iso can be used as a fallback since disc1 is UEFI enabled.
scripts/mk-images | 5 ++++- scripts/mk-images.x86 | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/mk-images b/scripts/mk-images index 9e5a94d..329389d 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -1007,9 +1007,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
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 721e4fd..985e758 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -153,7 +153,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"
- -- David Cantrell dcantrell@redhat.com Red Hat / Honolulu, HI
anaconda-devel@lists.stg.fedoraproject.org
-
David Cantrell -
Peter Jones