path: root/release/i386/make-memstick.sh
diff options
authorEd Maste <emaste@FreeBSD.org>2020-05-24 18:25:49 +0000
committerEd Maste <emaste@FreeBSD.org>2020-05-24 18:25:49 +0000
commit05f2347421781b4a9ca5de94c3dc9ada70bb6e84 (patch)
tree1d66160a38be430f204cd90a933f2703818e8754 /release/i386/make-memstick.sh
parent56e8cb87c6054a302503c33b39a4bd658f505c4a (diff)
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
Notes: svn path=/head/; revision=361437
Diffstat (limited to 'release/i386/make-memstick.sh')
1 files changed, 0 insertions, 9 deletions
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 6af2d248205c..6774e86ae550 100755
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -12,9 +12,6 @@
set -e
-scriptdir=$(dirname $(realpath $0))
-. ${scriptdir}/../../tools/boot/install-boot.sh
export PATH
@@ -39,15 +36,9 @@ makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1}
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