From 7fad9ac96cfbc1a9edb82cd4e0816dd71cc38a9d Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 2 Jul 2014 15:23:13 +0000
Subject: Now that GENERIC can boot on UEFI systems (r268158), switch the build
 to use UEFI-compatible images. These will boot as before on BIOS systems, but
 will boot using the UEFI loader on UEFI-aware systems.

---
 release/amd64/make-memstick.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'release/amd64/make-memstick.sh')

diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
index e10b892eeb29..6c289e093b8b 100755
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -29,20 +29,13 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
-makefs -B little -o label=FreeBSD_Install ${2} ${1}
+makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 if [ $? -ne 0 ]; then
 	echo "makefs failed"
 	exit 1
 fi
 rm ${1}/etc/fstab
 
-unit=$(mdconfig -a -t vnode -f ${2})
-if [ $? -ne 0 ]; then
-	echo "mdconfig failed"
-	exit 1
-fi
-gpart create -s BSD ${unit}
-gpart bootcode -b ${1}/boot/boot ${unit}
-gpart add -t freebsd-ufs ${unit}
-mdconfig -d -u ${unit}
+mkimg -s gpt -b ${1}/boot/pmbr -p efi:=${1}/boot/boot1.efifat -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
+rm ${2}.part
 
-- 
cgit v1.2.3