From owner-svn-src-all@freebsd.org Thu Oct 15 17:12:59 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7C5B74430B5; Thu, 15 Oct 2020 17:12:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CBwpM2ddFz3TW0; Thu, 15 Oct 2020 17:12:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DB4322BC5; Thu, 15 Oct 2020 17:12:59 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09FHCx6O091242; Thu, 15 Oct 2020 17:12:59 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09FHCwA8091241; Thu, 15 Oct 2020 17:12:58 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202010151712.09FHCwA8091241@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 15 Oct 2020 17:12:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366732 - in head/release: amd64 arm64 X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in head/release: amd64 arm64 X-SVN-Commit-Revision: 366732 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2020 17:12:59 -0000 Author: gjb Date: Thu Oct 15 17:12:58 2020 New Revision: 366732 URL: https://svnweb.freebsd.org/changeset/base/366732 Log: Increase the amd64 ISO ESP file size from 800KB to 1024KB. At some poing over the last week, the bootx64.efi file has grown past the 800KB threshold, resulting in being unable to copy it to the EFI/BOOT directory. # stat -f %z efiboot.znWo7m 819200 # stat -f %z stand-test.PIEugN/EFI/BOOT/bootx64.efi 842752 The comment in the script that creates the ISOs suggests that 800KB is the maximum allowed for the boot code, however I was able to boot an ISO with a 1024KB boot partition. Additionally, I verified against an ISO from OtherOS, where the boot EFI partition is 2.4MB. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/release/amd64/mkisoimages.sh head/release/arm64/mkisoimages.sh Modified: head/release/amd64/mkisoimages.sh ============================================================================== --- head/release/amd64/mkisoimages.sh Thu Oct 15 17:05:21 2020 (r366731) +++ head/release/amd64/mkisoimages.sh Thu Oct 15 17:12:58 2020 (r366732) @@ -46,10 +46,10 @@ if [ "$1" = "-b" ]; then bootable="-o bootimage=i386;$BASEBITSDIR/boot/cdboot -o no-emul-boot" # Make EFI system partition. - # 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 + # ESP file size in KB. + espsize="1024" + make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootable="$bootable -o bootimage=i386;${espfilename} -o no-emul-boot -o platformid=efi" shift Modified: head/release/arm64/mkisoimages.sh ============================================================================== --- head/release/arm64/mkisoimages.sh Thu Oct 15 17:05:21 2020 (r366731) +++ head/release/arm64/mkisoimages.sh Thu Oct 15 17:12:58 2020 (r366732) @@ -40,10 +40,10 @@ if [ "$1" = "-b" ]; then BASEBITSDIR="$4" # Make an EFI system partition. - # 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 + # ESP file size in KB. + espsize="1024" + make_esp_file ${espfilename} ${espsize} ${BASEBITSDIR}/boot/loader.efi bootable="-o bootimage=efi;${espfilename} -o no-emul-boot -o platformid=efi"