svn commit: r334735 - releng/11.2/release/amd64

[Glen Barber]

Author: gjb
Date: Wed Jun  6 20:31:15 2018
New Revision: 334735
URL: https://svnweb.freebsd.org/changeset/base/334735

Log:
  Revert r333006:
  
   This revision implemented hybrid ISOs for the amd64
   architecture, however it was discovered to have caused
   a regression in booting legacy-mode (BIOS/CSM).
  
   This restores the way ISOs were previously created, as
   the cause (and differences between head and stable/11
   and releng/11.2) have not been entirely identified.
  
  Approved by:	re (marius)
  Sponsored by:	The FreeBSD Foundation

Modified:
  releng/11.2/release/amd64/mkisoimages.sh

Modified: releng/11.2/release/amd64/mkisoimages.sh
==============================================================================
--- releng/11.2/release/amd64/mkisoimages.sh	Wed Jun  6 20:28:17 2018	(r334734)
+++ releng/11.2/release/amd64/mkisoimages.sh	Wed Jun  6 20:31:15 2018	(r334735)
@@ -23,18 +23,6 @@
 # extra-bits-dir, if provided, contains additional files to be merged
 # into base-bits-dir as part of making the image.
 
-if [ -z $ETDUMP ]; then
-	ETDUMP=etdump
-fi
-
-if [ -z $MAKEFS ]; then
-	MAKEFS=makefs
-fi
-
-if [ -z $MKIMG ]; then
-	MKIMG=mkimg
-fi
-
 if [ "x$1" = "x-b" ]; then
 	# This is highly x86-centric and will be used directly below.
 	bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
@@ -50,7 +38,7 @@ if [ "x$1" = "x-b" ]; then
 	umount efi
 	rmdir efi
 	mdconfig -d -u $device
-	bootable="$bootable -o bootimage=i386;efiboot.img -o no-emul-boot -o platformid=efi"
+	bootable="-o bootimage=i386;efiboot.img -o no-emul-boot $bootable"
 	
 	shift
 else
@@ -67,32 +55,6 @@ NAME="$1"; shift
 
 publisher="The FreeBSD Project.  http://www.FreeBSD.org/"
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$1/etc/fstab"
-$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
+makefs -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
 rm -f "$1/etc/fstab"
 rm -f efiboot.img
-
-if [ "$bootable" != "" ]; then
-	# Look for the EFI System Partition image we dropped in the ISO image.
-	for entry in `$ETDUMP --format shell $NAME`; do
-		eval $entry
-		if [ "$et_platform" = "efi" ]; then
-			espstart=`expr $et_lba \* 2048`
-			espsize=`expr $et_sectors \* 512`
-			espparam="-p efi::$espsize:$espstart"
-			break
-		fi
-	done
-
-	# Create a GPT image containing the partitions we need for hybrid boot.
-	imgsize=`stat -f %z $NAME`
-	$MKIMG -s gpt \
-	    --capacity $imgsize \
-	    -b $4/boot/pmbr \
-	    $espparam \
-	    -p freebsd-boot:=$4/boot/isoboot \
-	    -o hybrid.img
-
-	# Drop the PMBR, GPT, and boot code into the System Area of the ISO.
-	dd if=hybrid.img of=$NAME bs=32k count=1 conv=notrunc
-	rm -f hybrid.img
-fi