Makefile | 2 +- tools/livecd-iso-to-disk.sh | 44 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 5 deletions(-)
New commits: commit 64ddb70bda131b008b60df0135c20cd7769decc5 Author: Brian C. Lane <[email protected]> Date: Thu Sep 29 10:38:19 2011 -0700 Version 15.10 diff --git a/Makefile b/Makefile index 02382e4..bfff6b5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION = 15.9 +VERSION = 15.10 INSTALL = /usr/bin/install -c INSTALL_PROGRAM = ${INSTALL} commit 73a37a61bc514f75e0e438f378dad4beaeb46d25 Author: Brian C. Lane <[email protected]> Date: Wed Mar 23 14:06:25 2011 -0700 Images go into $SYSLINUXPATH Now that syslinux version check is fixed they end up in the correct place. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index f3578dd..539efb5 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1111,8 +1111,8 @@ if [ "$srctype" = "installer" ]; then sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG if [ -n "$efi" ]; then - # Images are in / now - sed -i -e "s;images/pxeboot/;;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI + # Images are in $SYSLINUXPATH now + sed -i -e "s;/images/pxeboot/;/$SYSLINUXPATH/;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI fi fi @@ -1123,11 +1123,10 @@ if [ "$srctype" = "netinst" ]; then else # The initrd has everything, so no stage2 sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG - - if [ -n "$efi" ]; then - # Images are in / now - sed -ie "s;images/pxeboot/;;g" $BOOTCONFIG_EFI - fi + fi + if [ -n "$efi" ]; then + # Images are in $SYSLINUXPATH now + sed -ie "s;/images/pxeboot/;/$SYSLINUXPATH/;g" $BOOTCONFIG_EFI fi fi commit 9eb159ef8898620059c63927d7e384a7cb7f21b6 Author: Brian C. Lane <[email protected]> Date: Thu Mar 17 14:11:43 2011 -0700 Add extracting BOOTX64.efi from iso (#688258) Some iso's (RHEL6) don't have the BOOTX64.efi binary in /EFI/BOOT, but it is in the eltorito image, so if it is missing from the iso extract it from the eltorito using the dumpet utility. diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 6a84b9d..f3578dd 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1048,6 +1048,34 @@ if [ -n "$efi" ]; then # this is a little ugly, but it gets the "interesting" named config file BOOTCONFIG_EFI=$TGTMNT$EFI_BOOT/+(BOOT|boot)?*.conf rm -f $TGTMNT$EFI_BOOT/grub.conf + + # On some images (RHEL) the BOOT*.efi file isn't in $EFI_BOOT, but is in + # the eltorito image, so try to extract it if it is missing + + # test for presence of *.efi grub binary + if [ ! -f $TGTMNT$EFI_BOOT/+(BOOT|boot)?*.efi ]; then + if [ ! -x /usr/bin/dumpet ]; then + echo "No /usr/bin/dumpet tool found. EFI image will not boot." + echo "Source media is missing grub binary in /EFI/BOOT/*efi" + exitclean + else + # dump the eltorito image with dumpet, output is $SRC.1 + dumpet -i $SRC -d + EFIMNT=$(mktemp -d /media/srctmp.XXXXXX) + mount -o loop $SRC.1 $EFIMNT + + if [ -f $EFIMNT$EFI_BOOT/+(BOOT|boot)?*.efi ]; then + cp $EFIMNT$EFI_BOOT/+(BOOT|boot)?*.efi $TGTMNT$EFI_BOOT + else + echo "No BOOT*.efi found in eltorito image. EFI will not boot" + umount $EFIMNT + rm $SRC.1 + exitclean + fi + umount $EFIMNT + rm $SRC.1 + fi + fi fi if [[ live == $srctype ]]; then commit 9292c0215f3b2f9cd149cf63b5169784d30eea27 Author: Brian C. Lane <[email protected]> Date: Thu Mar 17 10:22:41 2011 -0700 Add repo to DVD EFI install config file (#688258) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index e085e6f..6a84b9d 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1082,6 +1082,10 @@ fi if [ "$srctype" = "installer" ]; then sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG + if [ -n "$efi" ]; then + # Images are in / now + sed -i -e "s;images/pxeboot/;;g" -e "s;vmlinuz;vmlinuz ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG_EFI + fi fi # DVD Installer for netinst commit 8b3d835964c3764318e469dfe47bc31a0f5a44f6 Author: Brian C. Lane <[email protected]> Date: Wed Mar 16 17:22:30 2011 -0700 Add EFI support to netboot (#688258) diff --git a/tools/livecd-iso-to-disk.sh b/tools/livecd-iso-to-disk.sh index 580473d..e085e6f 100755 --- a/tools/livecd-iso-to-disk.sh +++ b/tools/livecd-iso-to-disk.sh @@ -1080,17 +1080,22 @@ fi # DVD Installer if [ "$srctype" = "installer" ]; then - sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI - sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI + sed -i -e "s;initrd=initrd.img;initrd=initrd.img ${LANG:+LANG=$LANG} repo=hd:$TGTLABEL:/;g" $BOOTCONFIG + sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG fi # DVD Installer for netinst if [ "$srctype" = "netinst" ]; then if [ "$imgtype" = "install" ]; then - sed -i -e "s;stage2=\S*;stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG $BOOTCONFIG_EFI + sed -i -e "s;stage2=\S*;stage2=hd:$TGTLABEL:/images/install.img;g" $BOOTCONFIG else # The initrd has everything, so no stage2 - sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI + sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG + + if [ -n "$efi" ]; then + # Images are in / now + sed -ie "s;images/pxeboot/;;g" $BOOTCONFIG_EFI + fi fi fi -- livecd mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/livecd
