D17947.id52045.diff
No OneTemporary
Actions

Size

29 KB

Referenced Files

None

Subscribers

None

D17947.id52045.diff
View Options

	Index: release/amd64/make-memstick.sh
	===================================================================
	--- release/amd64/make-memstick.sh
	+++ release/amd64/make-memstick.sh
	@@ -12,6 +12,9 @@

	set -e

	+scriptdir=$(dirname $(realpath $0))
	+. ${scriptdir}/../../tools/boot/install-boot.sh
	+
	PATH=/bin:/usr/bin:/sbin:/usr/sbin
	export PATH

	@@ -36,11 +39,16 @@
	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:=${1}/boot/boot1.efifat \
	+ -p efi:=${espfilename} \
	-p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \
	-a 2 \
	-o ${2}
	+rm ${espfilename}
	rm ${2}.part

	Index: release/amd64/mkisoimages.sh
	===================================================================
	--- release/amd64/mkisoimages.sh
	+++ release/amd64/mkisoimages.sh
	@@ -25,6 +25,9 @@

	set -e

	+scriptdir=$(dirname $(realpath $0))
	+. ${scriptdir}/../../tools/boot/install-boot.sh
	+
	if [ -z $ETDUMP ]; then
	ETDUMP=etdump
	fi
	@@ -43,18 +46,12 @@
	bootable="-o bootimage=i386;$BASEBITSDIR/boot/cdboot -o no-emul-boot"

	# Make EFI system partition (should be done with makefs in the future)
	- dd if=/dev/zero of=efiboot.img bs=4k count=200
	- device=`mdconfig -a -t vnode -f efiboot.img`
	- newfs_msdos -F 12 -m 0xf8 /dev/$device
	- mkdir efi
	- mount -t msdosfs /dev/$device efi
	- mkdir -p efi/efi/boot
	- cp "$BASEBITSDIR/boot/loader.efi" efi/efi/boot/bootx64.efi
	- umount efi
	- rmdir efi
	- mdconfig -d -u $device
	- bootable="$bootable -o bootimage=i386;efiboot.img -o no-emul-boot -o platformid=efi"
	-
	+ # The ISO file is a special case, in that it only has a maximum of
	+ # 800 KB available for the boot code. So make an 800 KB ESP
	+ espfilename=$(mktemp /tmp/efiboot.XXXXXX)
	+ make_esp_file ${espfilename} 800 ${BASEBITSDIR}/boot/loader.efi
	+ bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o platformid=efi"
	+
	shift
	else
	BASEBITSDIR="$3"
	@@ -73,7 +70,7 @@
	echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBITSDIR/etc/fstab"
	$MAKEFS -t cd9660 $bootable -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME" "$@"
	rm -f "$BASEBITSDIR/etc/fstab"
	-rm -f efiboot.img
	+rm -f ${espfilename}

	if [ "$bootable" != "" ]; then
	# Look for the EFI System Partition image we dropped in the ISO image.
	Index: release/arm64/make-memstick.sh
	===================================================================
	--- release/arm64/make-memstick.sh
	+++ release/arm64/make-memstick.sh
	@@ -15,6 +15,9 @@
	PATH=/bin:/usr/bin:/sbin:/usr/sbin
	export PATH

	+scriptdir=$(dirname $(realpath $0))
	+. ${scriptdir}/../../tools/boot/install-boot.sh
	+
	if [ $# -ne 2 ]; then
	echo "make-memstick.sh /path/to/directory /path/to/image/file"
	exit 1
	@@ -36,9 +39,14 @@
	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 gpt \
	- -p efi:=${1}/boot/boot1.efifat \
	+ -p efi:=${espfilename} \
	-p freebsd:=${2}.part \
	-o ${2}
	+rm ${espfilename}
	rm ${2}.part

	Index: release/i386/make-memstick.sh
	===================================================================
	--- release/i386/make-memstick.sh
	+++ release/i386/make-memstick.sh
	@@ -12,6 +12,9 @@

	set -e

	+scriptdir=$(dirname $(realpath $0))
	+. ${scriptdir}/../../tools/boot/install-boot.sh
	+
	PATH=/bin:/usr/bin:/sbin:/usr/sbin
	export PATH

	@@ -36,9 +39,15 @@
	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

	Index: release/tools/vmimage.subr
	===================================================================
	--- release/tools/vmimage.subr
	+++ release/tools/vmimage.subr
	@@ -6,6 +6,9 @@
	# Common functions for virtual machine image build scripts.
	#

	+scriptdir=$(dirname $(realpath $0))
	+. ${scriptdir}/../../tools/boot/install-boot.sh
	+
	export PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
	trap "cleanup" INT QUIT TRAP ABRT TERM

	@@ -29,10 +32,14 @@
	-o ${VMIMAGE}
	;;
	arm64:aarch64)
	+ # Create an ESP
	+ espfilename=$(mktemp /tmp/efiboot.XXXXXX)
	+ make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi
	mkimg -s mbr -f ${VMFORMAT} \
	- -p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \
	+ -p efi:=${espfilename} \
	-p freebsd:=${VMBASE} \
	-o ${VMIMAGE}
	+ rm ${espfilename}
	;;
	powerpc:powerpc*)
	mkimg -s apm -f ${VMFORMAT} \
	Index: share/man/man8/uefi.8
	===================================================================
	--- share/man/man8/uefi.8
	+++ share/man/man8/uefi.8
	@@ -24,7 +24,7 @@
	.\"
	.\" $FreeBSD$
	.\"
	-.Dd January 25, 2018
	+.Dd December 14, 2018
	.Dt UEFI 8
	.Os
	.Sh NAME
	@@ -77,20 +77,16 @@
	boot configuration for
	.Fx
	installs
	-.Pa boot1.efi
	+.Pa loader.efi
	in the default path.
	.It
	-.Pa boot1.efi
	+.Pa loader.efi
	reads boot configuration from
	.Pa /boot.config
	or
	.Pa /boot/config .
	-Unlike other first-stage boot loaders,
	-.Pa boot1.efi
	-passes the configuration to the next stage boot loader and does not
	-itself act on the contents of the file.
	.It
	-.Pa boot1.efi
	+.Pa loader.efi
	searches partitions of type
	.Li freebsd-ufs
	and
	@@ -98,7 +94,7 @@
	for
	.Pa loader.efi .
	The search begins with partitions on the device from which
	-.Pa boot1.efi
	+.Pa loader.efi
	was loaded, and continues with other available partitions.
	If both
	.Li freebsd-ufs
	@@ -107,9 +103,6 @@
	partitions exist on the same device the
	.Li freebsd-zfs
	partition is preferred.
	-.Pa boot1.efi
	-then loads and executes
	-.Pa loader.efi .
	.It
	.Pa loader.efi
	loads and boots the kernel, as described in
	@@ -122,20 +115,8 @@
	.Nm .
	.Sh FILES
	.Bl -tag -width /boot/loader -compact
	-.It Pa /boot/boot1.efi
	-First stage
	.Nm
	bootstrap
	-.It Pa /boot/boot1.efifat
	-.Xr msdosfs 5
	-FAT file system image containing
	-.Pa boot1.efi
	-for use by
	-.Xr bsdinstall 8
	-and the
	-.Ar bootcode
	-argument to
	-.Xr gpart 8 .
	.It Pa /boot/loader.efi
	Final stage bootstrap
	.It Pa /boot/kernel/kernel
	Index: tools/boot/install-boot.sh
	===================================================================
	--- tools/boot/install-boot.sh
	+++ tools/boot/install-boot.sh
	@@ -10,6 +10,10 @@

	# insert code here to guess what you have -- yikes!

	+# Minimum size of FAT filesystems, in KB.
	+fat32min=33292
	+fat16min=2100
	+
	die() {
	echo $*
	exit 1
	@@ -27,19 +31,151 @@
	gpart show $dev \| tail +2 \| awk '$4 == "'$part'" { print $3; }'
	}

	-make_esp() {
	- local dev dst mntpt
	+get_uefi_bootname() {
	+
	+ case ${TARGET:-$(uname -m)} in
	+ amd64) echo bootx64.efi ;;
	+ arm64) echo bootaa64.efi ;;
	+ i386) echo bootia32.efi ;;
	+ arm) echo bootarm.efi ;;
	+ *) die "machine type $(uname -m) doesn't support UEFI" ;;
	+ esac
	+}
	+
	+make_esp_file() {
	+ local file sizekb loader device mntpt fatbits efibootname
	+
	+ file=$1
	+ sizekb=$2
	+ loader=$3
	+
	+ if [ $sizekb -ge $fat32min ]; then
	+ fatbits=32
	+ elif [ $sizekb -ge $fat16min ]; then
	+ fatbits=16
	+ else
	+ fatbits=12
	+ fi
	+
	+ dd if=/dev/zero of=${file} bs=1k count=${sizekb}
	+ device=$(mdconfig -a -t vnode -f ${file})
	+ newfs_msdos -F ${fatbits} -c 1 -L EFISYS /dev/${device}
	+ mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
	+ mount -t msdosfs /dev/${device} ${mntpt}
	+ mkdir -p ${mntpt}/EFI/BOOT
	+ efibootname=$(get_uefi_bootname)
	+ cp "${loader}" ${mntpt}/EFI/BOOT/${efibootname}
	+ umount ${mntpt}
	+ rmdir ${mntpt}
	+ mdconfig -d -u ${device}
	+}
	+
	+make_esp_device() {
	+ local dev file mntpt fstype efibootname kbfree loadersize efibootfile
	+ local isboot1 existingbootentryloaderfile bootorder bootentry

	+ # ESP device node
	dev=$1
	- dst=$2
	+ file=$2

	- newfs_msdos -a 32 ${dev}
	mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
	- mount -t msdos ${dev} ${mntpt}
	- mkdir -p ${mntpt}/efi/boot
	- cp ${dst}/boot/loader.efi ${mntpt}/efi/boot/bootx64.efi
	+
	+ # See if we're using an existing (formatted) ESP
	+ fstype=$(fstyp ${dev})
	+
	+ if [ $? -ne 0 ]; then
	+ die "fstyp ${dev} failed"
	+ fi
	+
	+ if [ "${fstype}" != "msdosfs" ]; then
	+ newfs_msdos -F 32 -c 1 -L EFISYS ${dev}
	+ fi
	+
	+ mount -t msdosfs ${dev} ${mntpt}
	+ if [ $? -ne 0 ]; then
	+ die "Failed to mount ${dev} as an msdosfs filesystem"
	+ fi
	+
	+ echo "Mounted ESP ${dev} on ${mntpt}"
	+
	+ efibootname=$(get_uefi_bootname)
	+ kbfree=$(df -k ${mntpt} \| tail -1 \| cut -w -f 4)
	+ loadersize=$(stat -f %z ${file})
	+ loadersize=$(expr $loadersize / 1024)
	+
	+ # Check if /EFI/BOOT/BOOTxx.EFI is the FreeBSD boot1.efi
	+ # If it is, remove it to avoid leaving stale files around
	+ efibootfile=${mntpt}/EFI/BOOT/${efibootname}
	+ if [ -f ${efibootfile} ]; then
	+ isboot1=$(strings ${efibootfile} \| grep "FreeBSD EFI boot block")
	+
	+ if [ "${isboot1}" != "" ]; then
	+ echo "Removing old FreeBSD boot1.efi file ${efibootfile}"
	+ rm ${efibootfile}
	+ rmdir ${mntpt}/EFI/BOOT
	+ fi
	+ fi
	+
	+ if [ $kbfree -lt $loadersize ]; then
	+ umount ${mntpt}
	+ rmdir ${mntpt}
	+ echo "Failed to update the EFI System Partition ${dev}"
	+ echo "Insufficient space remaining for ${file}"
	+ echo -n "Run e.g \"mount -t msdosfs ${dev} /mnt\" to inspect it for "
	+ echo "files that can be removed"
	+ die
	+ fi
	+
	+ mkdir -p ${mntpt}/EFI/freebsd
	+ echo "Copying loader to /EFI/freebsd on ESP"
	+ cp ${file} ${mntpt}/EFI/freebsd/loader.efi
	+ if [ $? -ne 0 ]; then
	+ die "Failed to copy ${file}"
	+ fi
	+
	+ existingbootentryloaderfile=$(efibootmgr -v \| grep "${mntpt}//EFI/freebsd/loader.efi")
	+
	+ if [ "$existingbootentryloaderfile" == "" ]; then
	+ # Try again without the double forward-slash in the path
	+ existingbootentryloaderfile=$(efibootmgr -v \| grep "${mntpt}/EFI/freebsd/loader.efi")
	+ fi
	+
	+ if [ "$existingbootentryloaderfile" == "" ]; then
	+ echo "Creating UEFI boot entry for FreeBSD"
	+ efibootmgr --create --label FreeBSD --loader ${mntpt}/EFI/freebsd/loader.efi > /dev/null
	+ if [ $? -ne 0 ]; then
	+ die "Failed to create new boot entry"
	+ fi
	+
	+ bootorder=$(efivar --name 8be4df61-93ca-11d2-aa0d-00e098032b8c-BootOrder --print --no-name --hex)
	+ if [ "$bootorder" != "" ]; then
	+ bootentry=$(echo ${bootorder} \| cut -w -f 3)$(echo ${bootorder} \| cut -w -f 2)
	+ echo "Marking UEFI boot entry ${bootentry} active"
	+ efibootmgr --activate ${bootentry} > /dev/null
	+ if [ $? -ne 0 ]; then
	+ die "Failed to activate new boot entry"
	+ fi
	+ fi
	+ else
	+ echo "Existing UEFI FreeBSD boot entry found: not creating a new one"
	+ fi
	+
	umount ${mntpt}
	rmdir ${mntpt}
	+ echo "Finished updating ESP"
	+}
	+
	+make_esp() {
	+ local file loaderfile
	+
	+ file=$1
	+ loaderfile=$2
	+
	+ if [ -f $file ]; then
	+ make_esp_file ${file} ${fat32min} ${loaderfile}
	+ else
	+ make_esp_device ${file} ${loaderfile}
	+ fi
	}

	make_esp_mbr() {
	@@ -53,7 +189,7 @@
	die "No ESP slice found"
	fi
	fi
	- make_esp /dev/${dev}s${s} ${dst}
	+ make_esp /dev/${dev}s${s} ${dst}/boot/loader.efi
	}

	make_esp_gpt() {
	@@ -64,7 +200,7 @@
	if [ -z "$idx" ] ; then
	die "No ESP partition found"
	fi
	- make_esp /dev/${dev}p${idx} ${dst}
	+ make_esp /dev/${dev}p${idx} ${dst}/boot/loader.efi
	}

	boot_nogeli_gpt_ufs_legacy() {
	@@ -218,18 +354,32 @@
	doit gpart bootcode -p ${vtoc8} ${dev}
	}

	-DESTDIR=/
	+usage() {
	+ printf 'Usage: %s -b bios [-d destdir] -f fs [-g geli] [-h] [-o optargs] -s scheme <bootdev>\n' $0
	+ printf 'Options:\n'
	+ printf ' bootdev device to install the boot code on\n'
	+ printf ' -b bios bios type: legacy, uefi or both\n'
	+ printf ' -d destdir destination filesystem root\n'
	+ printf ' -f fs filesystem type: ufs or zfs\n'
	+ printf ' -g geli yes or no\n'
	+ printf ' -h this help/usage text\n'
	+ printf ' -o optargs optional arguments\n'
	+ printf ' -s scheme mbr or gpt\n'
	+ exit 0
	+}
	+
	+srcroot=/

	# Note: we really don't support geli boot in this script yet.
	geli=nogeli

	-while getopts "b:d:f:g:o:s:" opt; do
	+while getopts "b:d:f:g:ho:s:" opt; do
	case "$opt" in
	b)
	bios=${OPTARG}
	;;
	d)
	- DESTDIR=${OPTARG}
	+ srcroot=${OPTARG}
	;;
	f)
	fs=${OPTARG}
	@@ -246,25 +396,35 @@
	s)
	scheme=${OPTARG}
	;;
	+
	+ ?\|h)
	+ usage
	+ ;;
	esac
	done

	-shift $((OPTIND-1))
	-dev=$1
	+if [ "${scheme}" != "" -a "${fs}" != "" -a "${bios}" != "" ]; then
	+ shift $((OPTIND-1))
	+ dev=$1
	+fi

	# For gpt, we need to install pmbr as the primary boot loader
	# it knows about
	-gpt0=${DESTDIR}/boot/pmbr
	-gpt2=${DESTDIR}/boot/gptboot
	-gptzfs2=${DESTDIR}/boot/gptzfsboot
	+gpt0=${srcroot}/boot/pmbr
	+gpt2=${srcroot}/boot/gptboot
	+gptzfs2=${srcroot}/boot/gptzfsboot

	# For MBR, we have lots of choices, but select mbr, boot0 has issues with UEFI
	-mbr0=${DESTDIR}/boot/mbr
	-mbr2=${DESTDIR}/boot/boot
	+mbr0=${srcroot}/boot/mbr
	+mbr2=${srcroot}/boot/boot

	# VTOC8
	-vtoc8=${DESTDIR}/boot/boot1
	+vtoc8=${srcroot}/boot/boot1

	# sanity check here

	-eval boot_${geli}_${scheme}_${fs}_${bios} $dev $DESTDIR $opts \|\| echo "Unsupported boot env: ${geli}-${scheme}-${fs}-${bios}"
	+# Check if we've been given arguments. If not, this script is probably being
	+# sourced, so we shouldn't run anything.
	+if [ "${dev}" != "" ]; then
	+ eval boot_${geli}_${scheme}_${fs}_${bios} $dev $srcroot $opts \|\| echo "Unsupported boot env: ${geli}-${scheme}-${fs}-${bios}"
	+fi
	Index: tools/boot/rootgen.sh
	===================================================================
	--- tools/boot/rootgen.sh
	+++ tools/boot/rootgen.sh
	@@ -5,7 +5,8 @@
	passphrase=passphrase
	iterations=50000

	-do_boot1_efi=0
	+# The smallest FAT32 filesystem is 33292 KB
	+espsize=33292

	#
	# Builds all the bat-shit crazy combinations we support booting from,
	@@ -16,13 +17,13 @@
	# Sad panda sez: this runs as root, but could be userland if someone
	# creates userland geli and zfs tools.
	#
	-# This assumes an external prograam install-boot.sh which will install
	+# This assumes an external program install-boot.sh which will install
	# the appropriate boot files in the appropriate locations.
	#
	# These images assume ada0 will be the root image. We should likely
	# use labels, but we don't.
	#
	-# ASsumes you've already rebuilt... maybe bad? Also maybe bad: the env
	+# Assumes you've already rebuilt... maybe bad? Also maybe bad: the env
	# vars should likely be conditionally set to allow better automation.
	#

	@@ -34,29 +35,6 @@
	(cd $src ; tar cf - .) \| (cd $dst; tar xf -)
	}

	-make_esp()
	-{
	- local src dst md mntpt
	- src=$1
	- dst=$2
	-
	- if [ "${do_boot1_efi}" -eq 1 ]; then
	- cp ${src}/boot/boot1.efifat ${dst}
	- else
	- dd if=/dev/zero of=${dst} count=1 seek=$((100 * 1024 * 1024 / 512))
	- md=$(mdconfig -f ${dst})
	- newfs_msdos -a 32 /dev/${md}
	- mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
	- mount -t msdos /dev/${md} ${mntpt}
	-# mkdir -p ${mntpt}/efi/freebsd # not yet
	- mkdir -p ${mntpt}/efi/boot
	- cp ${src}/boot/loader.efi ${mntpt}/efi/boot/bootx64.efi
	- umount ${mntpt}
	- rmdir ${mntpt}
	- mdconfig -d -u ${md}
	- fi
	-}
	-
	mk_nogeli_gpt_ufs_legacy() {
	src=$1
	img=$2
	@@ -78,7 +56,7 @@
	cat > ${src}/etc/fstab <<EOF
	/dev/ada0p2 / ufs rw 1 1
	EOF
	- make_esp ${src} ${img}.p1
	+ make_esp_file ${img}.p1 ${espsize} ${src}
	makefs -t ffs -B little -s 200m ${img}.p2 ${src}
	mkimg -s gpt \
	-p efi:=${img}.p1 \
	@@ -93,7 +71,7 @@
	cat > ${src}/etc/fstab <<EOF
	/dev/ada0p3 / ufs rw 1 1
	EOF
	- make_esp ${src} ${img}.p1
	+ make_esp_file ${img}.p1 ${espsize} ${src}
	makefs -t ffs -B little -s 200m ${img}.p3 ${src}
	# p1 is boot for uefi, p2 is boot for gpt, p3 is /
	mkimg -b ${src}/boot/pmbr -s gpt \
	@@ -155,7 +133,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
	md=$(mdconfig -f ${img})
	gpart create -s gpt ${md}
	- gpart add -t efi -s 800k -a 4k ${md}
	+ gpart add -t efi -s ${espsize}k -a 4k ${md}
	gpart add -t freebsd-zfs -l root $md
	# install-boot will make this bootable
	zpool create -O mountpoint=none -R ${mntpt} ${pool} ${md}p2
	@@ -193,7 +171,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
	md=$(mdconfig -f ${img})
	gpart create -s gpt ${md}
	- gpart add -t efi -s 800k -a 4k ${md}
	+ gpart add -t efi -s ${espsize}k -a 4k ${md}
	gpart add -t freebsd-boot -s 400k -a 4k ${md} # <= ~540k
	gpart add -t freebsd-zfs -l root $md
	# install-boot will make this bootable
	@@ -239,7 +217,7 @@
	cat > ${src}/etc/fstab <<EOF
	/dev/ada0s2a / ufs rw 1 1
	EOF
	- make_esp ${src} ${img}.s1
	+ make_esp_file ${img}.s1 ${espsize} ${src}
	makefs -t ffs -B little -s 200m ${img}.s2a ${src}
	mkimg -s bsd -p freebsd-ufs:=${img}.s2a -o ${img}.s2
	mkimg -a 1 -s mbr -p efi:=${img}.s1 -p freebsd:=${img}.s2 -o ${img}
	@@ -253,7 +231,7 @@
	cat > ${src}/etc/fstab <<EOF
	/dev/ada0s2a / ufs rw 1 1
	EOF
	- make_esp ${src} ${img}.s1
	+ make_esp_file ${img}.s1 ${espsize} ${src}
	makefs -t ffs -B little -s 200m ${img}.s2a ${src}
	mkimg -s bsd -b ${src}/boot/boot -p freebsd-ufs:=${img}.s2a -o ${img}.s2
	mkimg -a 2 -s mbr -b ${src}/boot/mbr -p efi:=${img}.s1 -p freebsd:=${img}.s2 -o ${img}
	@@ -313,7 +291,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
	md=$(mdconfig -f ${img})
	gpart create -s mbr ${md}
	- gpart add -t \!239 -s 800k ${md}
	+ gpart add -t efi -s ${espsize}k ${md}
	gpart add -t freebsd ${md}
	gpart set -a active -i 2 ${md}
	gpart create -s bsd ${md}s2
	@@ -354,7 +332,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$((200 * 1024 * 1024 / 512))
	md=$(mdconfig -f ${img})
	gpart create -s mbr ${md}
	- gpart add -t \!239 -s 800k ${md}
	+ gpart add -t efi -s ${espsize}k ${md}
	gpart add -t freebsd ${md}
	gpart set -a active -i 2 ${md}
	gpart create -s bsd ${md}s2
	@@ -430,7 +408,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
	md=$(mdconfig -f ${img})
	gpart create -s gpt ${md}
	- gpart add -t efi -s 800k -a 4k ${md}
	+ gpart add -t efi -s ${espsize}k -a 4k ${md}
	gpart add -t freebsd-ufs -l root $md
	# install-boot will make this bootable
	echo ${passphrase} \| geli init -bg -e AES-XTS -i ${iterations} -J - -l 256 -s 4096 ${md}p2
	@@ -466,7 +444,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
	md=$(mdconfig -f ${img})
	gpart create -s gpt ${md}
	- gpart add -t efi -s 800k -a 4k ${md}
	+ gpart add -t efi -s ${espsize}k -a 4k ${md}
	gpart add -t freebsd-boot -s 400k -a 4k ${md} # <= ~540k
	gpart add -t freebsd-ufs -l root $md
	# install-boot will make this bootable
	@@ -547,7 +525,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
	md=$(mdconfig -f ${img})
	gpart create -s gpt ${md}
	- gpart add -t efi -s 800k -a 4k ${md}
	+ gpart add -t efi -s ${espsize}k -a 4k ${md}
	gpart add -t freebsd-zfs -l root $md
	# install-boot will make this bootable
	echo ${passphrase} \| geli init -bg -e AES-XTS -i ${iterations} -J - -l 256 -s 4096 ${md}p2
	@@ -590,7 +568,7 @@
	dd if=/dev/zero of=${img} count=1 seek=$(( 200 * 1024 * 1024 / 512 ))
	md=$(mdconfig -f ${img})
	gpart create -s gpt ${md}
	- gpart add -t efi -s 800k -a 4k ${md}
	+ gpart add -t efi -s ${espsize}k -a 4k ${md}
	gpart add -t freebsd-boot -s 400k -a 4k ${md} # <= ~540k
	gpart add -t freebsd-zfs -l root $md
	# install-boot will make this bootable
	Index: tools/tools/nanobsd/embedded/common
	===================================================================
	--- tools/tools/nanobsd/embedded/common
	+++ tools/tools/nanobsd/embedded/common
	@@ -301,7 +301,7 @@
	# s1 is boot, s2 is cfg, s3 is /, not sure how to make that
	# boot (marked as active) with mkimg yet
	mkimg -a 2 ${fmtarg} ${bootmbr} -s mbr \
	- -p efi:=${NANO_WORLDDIR}/boot/boot1.efifat \
	+ -p efi:=${NANO_WORLDDIR}/boot/efiboot.img \
	-p ${s2}:=${NANO_LOG}/_.s2 \
	-p ${s3}:=${NANO_LOG}/_.s3 \
	-o ${out}
	@@ -310,7 +310,7 @@
	# p1 is boot for uefi, p2 is boot for gpt, p3 is cfg, p4 is /
	# and p5 is alt-root (after resize)
	mkimg -a 2 ${fmtarg} ${bootmbr} -s gpt \
	- -p efi:=${NANO_WORLDDIR}/boot/boot1.efifat \
	+ -p efi:=${NANO_WORLDDIR}/boot/efiboot.img \
	-p freebsd-boot:=${NAANO_WORLDDIR}/boot/gptboot \
	-p ${p3}:=${NANO_LOG}/_.p3 \
	-p ${p4}:=${NANO_LOG}/_.p4 \
	Index: usr.sbin/bsdinstall/partedit/gpart_ops.c
	===================================================================
	--- usr.sbin/bsdinstall/partedit/gpart_ops.c
	+++ usr.sbin/bsdinstall/partedit/gpart_ops.c
	@@ -31,6 +31,7 @@
	#include <sys/param.h>
	#include <sys/stat.h>
	#include <errno.h>
	+#include <fcntl.h>
	#include <libutil.h>
	#include <inttypes.h>

	@@ -192,7 +193,9 @@
	for (i = 0; i < (int)nitems(items); i++) {
	if (items[i].state == 0)
	continue;
	- if (strcmp(items[i].name, "FAT16") == 0)
	+ if (strcmp(items[i].name, "FAT32") == 0)
	+ strcat(command, "-F 32 -c 1");
	+ else if (strcmp(items[i].name, "FAT16") == 0)
	strcat(command, "-F 16 ");
	else if (strcmp(items[i].name, "FAT12") == 0)
	strcat(command, "-F 12 ");
	@@ -400,7 +403,7 @@
	TRUE);
	return;
	}
	-
	+
	bootsize = lseek(bootfd, 0, SEEK_END);
	boot = malloc(bootsize);
	lseek(bootfd, 0, SEEK_SET);
	@@ -706,8 +709,17 @@
	if (strcmp(type, "freebsd-swap") == 0)
	mountpoint = "none";
	if (strcmp(type, bootpart_type(scheme, &default_bootmount)) == 0) {
	- if (default_bootmount == NULL)
	+ if (default_bootmount == NULL) {
	+
	+ int fd = open("/tmp/bsdinstall-esps", O_CREAT \| O_WRONLY \| O_APPEND,
	+ 0600);
	+ if (fd > 0) {
	+ write(fd, md->name, strlen(md->name));
	+ close(fd);
	+ }
	+
	md->bootcode = 1;
	+ }
	else if (mountpoint == NULL \|\| strlen(mountpoint) == 0)
	mountpoint = default_bootmount;
	}
	Index: usr.sbin/bsdinstall/partedit/partedit_arm64.c
	===================================================================
	--- usr.sbin/bsdinstall/partedit/partedit_arm64.c
	+++ usr.sbin/bsdinstall/partedit/partedit_arm64.c
	@@ -35,8 +35,7 @@
	#include "partedit.h"

	/* EFI partition size in bytes */
	-#define EFI_BOOTPART_SIZE (200 * 1024 * 1024)
	-#define EFI_BOOTPART_PATH "/boot/boot1.efifat"
	+#define EFI_BOOTPART_SIZE (260 * 1024 * 1024)

	const char *
	default_scheme(void)
	@@ -95,10 +94,7 @@
	partcode_path(const char part_type, const char fs_type)
	{

	- if (strcmp(part_type, "GPT") == 0)
	- return (EFI_BOOTPART_PATH);
	-
	- /* No boot partition data for non-GPT */
	+ /* No boot partition data for ARM64 */
	return (NULL);
	}

	Index: usr.sbin/bsdinstall/partedit/partedit_x86.c
	===================================================================
	--- usr.sbin/bsdinstall/partedit/partedit_x86.c
	+++ usr.sbin/bsdinstall/partedit/partedit_x86.c
	@@ -35,8 +35,7 @@
	#include "partedit.h"

	/* EFI partition size in bytes */
	-#define EFI_BOOTPART_SIZE (200 * 1024 * 1024)
	-#define EFI_BOOTPART_PATH "/boot/boot1.efifat"
	+#define EFI_BOOTPART_SIZE (260 * 1024 * 1024)

	static const char *
	x86_bootmethod(void)
	@@ -141,16 +140,14 @@
	partcode_path(const char part_type, const char fs_type)
	{

	- if (strcmp(part_type, "GPT") == 0) {
	- if (strcmp(x86_bootmethod(), "UEFI") == 0)
	- return (EFI_BOOTPART_PATH);
	- else if (strcmp(fs_type, "zfs") == 0)
	+ if (strcmp(part_type, "GPT") == 0 && strcmp(x86_bootmethod(), "UEFI") != 0) {
	+ if (strcmp(fs_type, "zfs") == 0)
	return ("/boot/gptzfsboot");
	else
	return ("/boot/gptboot");
	}

	- /* No partcode except for GPT */
	+ /* No partcode except for non-UEFI GPT */
	return (NULL);
	}

	Index: usr.sbin/bsdinstall/scripts/bootconfig
	===================================================================
	--- usr.sbin/bsdinstall/scripts/bootconfig
	+++ usr.sbin/bsdinstall/scripts/bootconfig
	@@ -1,5 +1,6 @@
	#!/bin/sh
	#-
	+# Copyright (c) 2018 Rebecca Cran
	# Copyright (c) 2017 Nathan Whitehorn
	# All rights reserved.
	#
	@@ -35,6 +36,95 @@
	fi
	fi

	-# For new-style EFI booting, add code here
	-# Add boot0cfg for MBR BIOS booting?
	+# Update the ESP (EFI System Partition) with the new bootloader
	+if [ $(uname -m) == amd64 -o $(uname -m) == i386 ]; then
	+ X86_BOOTMETHOD=$(sysctl -n machdep.bootmethod)
	+fi
	+
	+if [ $(uname -m) == arm64 -o "$X86_BOOTMETHOD" == "UEFI" ]; then
	+ mkdir $BSDINSTALL_TMPETC/esp
	+ UFSBOOT_ESPS=$(cat /tmp/bsdinstall-esps)
	+
	+ esps=0
	+
	+ if [ "$ZFSBOOT_DISKS" ]; then
	+ # We're in a ZFS install environment
	+ for disk in $ZFSBOOT_DISKS; do
	+ index=$(gpart show $disk \| cut -w -f 4,5 \| grep "efi" \| cut -w -f 1)
	+ if [ -e /dev/${disk}p${index} ]; then
	+ ESPS="$ESPS ${disk}p${index}"
	+ else
	+ ESPS="$ESPS ${disk}s${index}"
	+ fi
	+
	+ let esps= $esps + 1
	+ done
	+ fi
	+
	+ if [ "$UFSBOOT_ESPS" ]; then
	+ # We're in a UFS install environment
	+ for partition in $UFSBOOT_ESPS; do
	+ ESPS="$ESPS $partition"
	+ let esps= $esps + 1
	+ done
	+ fi
	+
	+ if [ "$ESPS" == "" ]; then
	+ # The installer hasn't given us any ESPs to use.
	+ # Try and figure out which to use by looking for an
	+ # unformatted efi partition
	+ for disk in $(sysctl -n kern.disks); do
	+ hasfreebsd=$(gpart show $disk \| cut -w -f 4,5 \| grep "freebsd")
	+ if [ "$hasfreebsd" != "" ]; then
	+ index=$(gpart show $disk \| cut -w -f 4,5 \| grep "efi" \| cut -w -f 1)
	+ mntpt=$(mktemp -d /tmp/stand-test.XXXXXX)
	+ if [ -e /dev/${disk}p${index} ]; then
	+ dev=${disk}p${index}
	+ else
	+ dev=/${disk}s${index}
	+ fi
	+
	+ # Try and mount it. If it fails, assume it's
	+ # unformatted and should be used.
	+ mount -t msdosfs /dev/${dev} ${mntpt}
	+ if [ $? -ne 0 ]; then
	+ ESPS="$ESPS ${dev}"
	+ let esps= $esps + 1
	+ else
	+ umount ${mntpt}
	+ fi
	+ rmdir ${mntpt}
	+ fi
	+ done
	+ fi
	+
	+ for esp in $ESPS; do
	+ newfs_msdos -F 32 -c 1 -L EFISYS /dev/$esp
	+ mount -t msdosfs /dev/$esp $BSDINSTALL_TMPETC/esp
	+
	+ mkdir -p $BSDINSTALL_TMPETC/esp/EFI/freebsd
	+ cp $BSDINSTALL_CHROOT/boot/loader.efi $BSDINSTALL_TMPETC/esp/EFI/freebsd/loader.efi
	+
	+ if [ $esps -gt 1 ]; then
	+ bootlabel="FreeBSD (${esp})"
	+ else
	+ bootlabel="FreeBSD"
	+ fi
	+
	+ efibootmgr --create --label "$bootlabel" --loader $BSDINSTALL_TMPETC/esp/EFI/freebsd/loader.efi
	+
	+ umount $BSDINSTALL_TMPETC/esp

	+ # When creating new entries, efibootmgr doesn't mark them active, so we need to
	+ # do so. It doesn't make it easy to find which entry it just added, so rely on
	+ # the fact that it places the new entry first in BootOrder.
	+
	+ bootorder=$(efivar --name 8be4df61-93ca-11d2-aa0d-00e098032b8c-BootOrder --print --no-name --hex)
	+ bootentry=$(echo $bootorder \| cut -w -f 3)$(echo $bootorder \| cut -w -f 2)
	+ efibootmgr --activate $bootentry
	+ done
	+
	+ rmdir $BSDINSTALL_TMPETC/esp
	+fi
	+
	+# Add boot0cfg for MBR BIOS booting?
	Index: usr.sbin/bsdinstall/scripts/zfsboot
	===================================================================
	--- usr.sbin/bsdinstall/scripts/zfsboot
	+++ usr.sbin/bsdinstall/scripts/zfsboot
	@@ -213,7 +213,6 @@
	LN_SF='ln -sf "%s" "%s"'
	MKDIR_P='mkdir -p "%s"'
	MOUNT_TYPE='mount -t %s "%s" "%s"'
	-NEWFS_ESP='newfs_msdos -F %s -L "%s" "%s"'
	PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\""
	PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"'
	SHELL_TRUNCATE=':> "%s"'
	@@ -851,29 +850,7 @@
	"$align_small" efiboot$index efi 200M \
	$disk \|\| return $FAILURE

	- f_eval_catch $funcname mkdir "$MKDIR_P" \
	- "$BSDINSTALL_TMPETC/esp" \|\|
	- return $FAILURE
	- f_eval_catch $funcname newfs_msdos "$NEWFS_ESP" "16" \
	- "EFISYS" "/dev/${disk}p1" \|\|
	- return $FAILURE
	- f_eval_catch $funcname mount "$MOUNT_TYPE" "msdosfs" \
	- "/dev/${disk}p1" \
	- "$BSDINSTALL_TMPETC/esp" \|\|
	- return $FAILURE
	- f_eval_catch $funcname mkdir "$MKDIR_P" \
	- "$BSDINSTALL_TMPETC/esp/efi/boot" \|\|
	- return $FAILURE
	- f_eval_catch $funcname cp "$COPY" "/boot/loader.efi" \
	- "$BSDINSTALL_TMPETC/esp/efi/boot/$ZFSBOOT_ESP_NAME" \|\|
	- return $FAILURE
	- f_eval_catch $funcname echo "$ECHO_OVERWRITE" \
	- "$ZFSBOOT_ESP_NAME" \
	- "$BSDINSTALL_TMPETC/esp/efi/boot/startup.nsh" \|\|
	- return $FAILURE
	- f_eval_catch $funcname umount "$UMOUNT" \
	- "$BSDINSTALL_TMPETC/esp" \|\|
	- return $FAILURE
	+ # We'll configure the ESP in bootconfig
	fi

	if [ "$ZFSBOOT_BOOT_TYPE" = "BIOS" -o \
	@@ -1595,20 +1572,6 @@
	;;
	esac

	-#
	-# The EFI loader installed in the ESP (EFI System Partition) must
	-# have the expected name in order to load correctly.
	-#
	-[ "$ZFSBOOT_ESP_NAME" ] \|\| case "${UNAME_m:-$( uname -m )}" in
	- arm64) ZFSBOOT_ESP_NAME=BOOTaa64.efi ;;
	- arm) ZFSBOOT_ESP_NAME=BOOTarm.efi ;;
	- i386) ZFSBOOT_ESP_NAME=BOOTia32.efi ;;
	- amd64) ZFSBOOT_ESP_NAME=BOOTx64.efi ;;
	- *)
	- f_dprintf "Unsupported architecture: %s" $UNAME_m
	- f_die
	-esac
	-
	#
	# Loop over the main menu until we've accomplished what we came here to do
	#

File Metadata

Mime Type: text/plain
Expires: Sun, Jan 18, 5:55 PM (9 h, 8 s)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 27714179
Default Alt Text: D17947.id52045.diff (29 KB)

D17947.id52045.diffNo OneTemporaryActions

D17947.id52045.diffView Options

File Metadata

Event Timeline

D17947.id52045.diff
No OneTemporary
Actions

D17947.id52045.diff
View Options