From owner-svn-src-all@freebsd.org Wed Jun 6 20:31:16 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 56248FE210F; Wed, 6 Jun 2018 20:31:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 093C786512; Wed, 6 Jun 2018 20:31:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C57207E92; Wed, 6 Jun 2018 20:31:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w56KVFon022434; Wed, 6 Jun 2018 20:31:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w56KVFk0022433; Wed, 6 Jun 2018 20:31:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201806062031.w56KVFk0022433@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 6 Jun 2018 20:31:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r334735 - releng/11.2/release/amd64 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.2/release/amd64 X-SVN-Commit-Revision: 334735 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jun 2018 20:31:16 -0000 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