diff options
| author | Peter Jones <pjones@redhat.com> | 2009-03-10 00:00:01 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2009-05-07 11:04:06 -0400 |
| commit | 9a5539ab4c77d97b9bf3e9a5a10d9505563c201e (patch) | |
| tree | 192b2d3416c4eff74edd79b75a89d5b7ae164829 /scripts/mk-images.x86 | |
| parent | 935e69aa2de7eac3b0b5e095623c337b763e0375 (diff) | |
| download | anaconda-9a5539ab4c77d97b9bf3e9a5a10d9505563c201e.tar.gz anaconda-9a5539ab4c77d97b9bf3e9a5a10d9505563c201e.tar.xz anaconda-9a5539ab4c77d97b9bf3e9a5a10d9505563c201e.zip | |
Update EFI CD booting code in mk-images
Update the efi image creation code to reflect what we've actually been using
for two plus months.
Diffstat (limited to 'scripts/mk-images.x86')
| -rw-r--r-- | scripts/mk-images.x86 | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index fe7a978b9..22db99cc5 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -159,15 +159,16 @@ doPostImages() { if [ -n "$BOOTISO" ]; then EFIARGS="" EFIGRAFT="" - if [ -f $TOPDESTPATH/images/pxeboot/efiboot.img ]; then - cp $TOPDESTPATH/images/pxeboot/efiboot.img $TOPDESTPATH/isolinux/efiboot.img - EFIARGS="-eltorito-alt-boot -e isolinux/efiboot.img -no-emul-boot" - EFIGRAFT="EFI/boot=$TOPDESTPATH/EFI/boot" + if [ -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" + else + echo "No efiboot.img found, making BIOS-only boot.iso" fi BIOSARGS="-b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table" - echo $PWD:\$ mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT - mkisofs -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images/install.img=$TOPDESTPATH/images/install.img $EFIGRAFT - implantisomd5 $TOPDESTPATH/images/$BOOTISO + mkisocmd="mkisofs -v -o $TOPDESTPATH/images/$BOOTISO $BIOSARGS $EFIARGS -R -J -V "$PRODUCT" -T -graft-points isolinux=$TOPDESTPATH/isolinux images=$TOPDESTPATH/images $EFIGRAFT" + echo $PWD:\$ $mkisocmd + $mkisocmd fi - } |