diff options
| author | David Cantrell <dcantrell@redhat.com> | 2009-03-05 15:30:43 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-03-05 15:30:43 -1000 |
| commit | 641ac3d2faca1df59f86ca5a0441559aa0d35488 (patch) | |
| tree | d934d42e46d62275368e38e9227bf73fd9f3735c /scripts/mk-images.x86 | |
| parent | ee37a416dda44c0b96e00d7b18338e530ffaf4b5 (diff) | |
| download | anaconda-641ac3d2faca1df59f86ca5a0441559aa0d35488.tar.gz anaconda-641ac3d2faca1df59f86ca5a0441559aa0d35488.tar.xz anaconda-641ac3d2faca1df59f86ca5a0441559aa0d35488.zip | |
Merge in changes present in anaconda pkgcvs.
Diffstat (limited to 'scripts/mk-images.x86')
| -rw-r--r-- | scripts/mk-images.x86 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/mk-images.x86 b/scripts/mk-images.x86 index 813d94185..fe7a978b9 100644 --- a/scripts/mk-images.x86 +++ b/scripts/mk-images.x86 @@ -158,11 +158,16 @@ __EOT__ doPostImages() { if [ -n "$BOOTISO" ]; then EFIARGS="" - if [ -f isolinux/efiboot.img ]; then + 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" fi - mkisofs -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 + 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 fi } |