From owner-svn-src-stable-12@freebsd.org Fri Jun 19 19:25:48 2020 Return-Path: Delivered-To: svn-src-stable-12@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 140D4337336; Fri, 19 Jun 2020 19:25:48 +0000 (UTC) (envelope-from manu@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 49pTL36lzkz3SZd; Fri, 19 Jun 2020 19:25:47 +0000 (UTC) (envelope-from manu@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 E34C320026; Fri, 19 Jun 2020 19:25:47 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05JJPl0A000404; Fri, 19 Jun 2020 19:25:47 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05JJPlP6000402; Fri, 19 Jun 2020 19:25:47 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202006191925.05JJPlP6000402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Fri, 19 Jun 2020 19:25:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r362414 - in stable/12/release: . tools X-SVN-Group: stable-12 X-SVN-Commit-Author: manu X-SVN-Commit-Paths: in stable/12/release: . tools X-SVN-Commit-Revision: 362414 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 19:25:48 -0000 Author: manu Date: Fri Jun 19 19:25:47 2020 New Revision: 362414 URL: https://svnweb.freebsd.org/changeset/base/362414 Log: MFC r361980, r362010 r361980: release: amd64 efi boot name is bootx64 efi_boot_name is just used for arm image so no harm done. Reported by: gonzo r362010: release: Fix arm GPT image msdosfs labels are capitalized, use EFI instead of efi. Modified: stable/12/release/release.sh stable/12/release/tools/arm.subr Directory Properties: stable/12/ (props changed) Modified: stable/12/release/release.sh ============================================================================== --- stable/12/release/release.sh Fri Jun 19 19:24:36 2020 (r362413) +++ stable/12/release/release.sh Fri Jun 19 19:25:47 2020 (r362414) @@ -368,7 +368,7 @@ efi_boot_name() echo "bootaa64.efi" ;; amd64) - echo "bootx86.efi" + echo "bootx64.efi" ;; esac } Modified: stable/12/release/tools/arm.subr ============================================================================== --- stable/12/release/tools/arm.subr Fri Jun 19 19:24:36 2020 (r362413) +++ stable/12/release/tools/arm.subr Fri Jun 19 19:25:47 2020 (r362414) @@ -194,7 +194,7 @@ arm_install_base() { if [ "${PART_SCHEME}" == "GPT" ]; then echo "/dev/ufs/rootfs / ufs rw 1 1" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - echo "/dev/msdosfs/efi /boot/efi msdosfs rw,noatime 0 0" \ + echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab fi if [ "${PART_SCHEME}" == "MBR" ]; then