Date: Sun, 24 May 2020 18:25:50 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361437 - head/release/i386 Message-ID: <202005241825.04OIPogZ065386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Sun May 24 18:25:49 2020 New Revision: 361437 URL: https://svnweb.freebsd.org/changeset/base/361437 Log: Make i386 memstick images bootable. This reverts the i386 part of r342283, "Rework UEFI ESP generation", and the followup commit in r342690. r342283 added an ESP to the i386 memstick image, and as a side effect made the ESP the active partition, not the bootcode-containing UFS partition. As a result the i386 memstick images would not boot in either UEFI or legacy mode - UEFI failed because we do not support i386 UEFI booting, and legacy mode failed because the partition with legacy bootcode was not active. The bootcode-containing UFS partition is again the only, and active, partition. PR: 246494 Reported by: Jorge Maidana Differential Revision: The FreeBSD Foundation Modified: head/release/i386/make-memstick.sh Modified: head/release/i386/make-memstick.sh ============================================================================== --- head/release/i386/make-memstick.sh Sun May 24 17:51:14 2020 (r361436) +++ head/release/i386/make-memstick.sh Sun May 24 18:25:49 2020 (r361437) @@ -12,9 +12,6 @@ set -e -scriptdir=$(dirname $(realpath $0)) -. ${scriptdir}/../../tools/boot/install-boot.sh - PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH @@ -39,15 +36,9 @@ makefs -B little -o label=FreeBSD_Install -o version=2 rm ${1}/etc/fstab rm ${1}/etc/rc.conf.local -# Make an ESP in a file. -espfilename=$(mktemp /tmp/efiboot.XXXXXX) -make_esp_file ${espfilename} ${fat32min} ${1}/boot/loader.efi - mkimg -s mbr \ -b ${1}/boot/mbr \ - -p efi:=${espfilename} \ -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \ -o ${2} -rm ${espfilename} rm ${2}.part
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005241825.04OIPogZ065386>