Date: Mon, 7 Sep 2020 18:47:26 +0000 (UTC) From: Oleksandr Tymoshenko <gonzo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r365425 - stable/12/release/tools Message-ID: <202009071847.087IlQq0098503@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gonzo Date: Mon Sep 7 18:47:25 2020 New Revision: 365425 URL: https://svnweb.freebsd.org/changeset/base/365425 Log: Revert r364939 and add a stable/12 approach for populating the ESP make_esp_file is not available in stable/12 so r364939 broke VM-related targets. Revert offending commit and use pre-r342283 approach to populate ESP partition. PR: 249168 Tested on: VirtualBox, Hyper-V v2 VM Modified: stable/12/release/tools/vmimage.subr Modified: stable/12/release/tools/vmimage.subr ============================================================================== --- stable/12/release/tools/vmimage.subr Mon Sep 7 18:15:58 2020 (r365424) +++ stable/12/release/tools/vmimage.subr Mon Sep 7 18:47:25 2020 (r365425) @@ -21,17 +21,13 @@ write_partition_layout() { case "${TARGET}:${TARGET_ARCH}" in amd64:amd64 | i386:i386) - # Create an ESP - espfilename=$(mktemp /tmp/efiboot.XXXXXX) - make_esp_file ${espfilename} ${fat32min} ${BOOTFILES}/efi/loader_lua/loader_lua.efi mkimg -s gpt -f ${VMFORMAT} \ -b ${BOOTFILES}/i386/pmbr/pmbr \ -p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot \ - -p efi:=${espfilename} \ + -p efi:=${BOOTFILES}/efi/boot1/boot1.efifat \ ${SWAPOPT} \ -p freebsd-ufs/rootfs:=${VMBASE} \ -o ${VMIMAGE} - rm ${espfilename} ;; arm64:aarch64) mkimg -s mbr -f ${VMFORMAT} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009071847.087IlQq0098503>