From nobody Fri Sep 23 16:03:25 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MYxlK3Ffzz4dJBF; Fri, 23 Sep 2022 16:03:25 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MYxlK2jrvz4NPl; Fri, 23 Sep 2022 16:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663949005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZzHiBrho7Zl1j04rooesr1/hfK/X5ql1x6xjqE66yM=; b=D5iXEOsfH9WJkOpo2RlmtuI4TiQEfkgTHzO2XQdLf7WNLyQVKZu/x8d1Rkrj1vQhyY/p70 OTEPMuCmibw7ipS1Q2gyOV7YqD7pvU4EYCmrXbboBddzRBzflEuqZ21/cuIrKoBZpk9LsE lQ+gi2CxG2BUuMy0KaB9pUN1DnxCeynUxCqPE7HyLBCflkfpOIjB9ewvEPzl+9Q+Bt1+jF PCFeC2tA3XwicoG4wtlp2I1EvajMWZRqcQnUEJpinpvfiSCqorsDOHG6euoL97vWc1X3OP HdG/LuW6sqb4kueKFcMP9+O6RFNy0qOjAoQ+2D/Wz8vw+jw6sCLJYax2fL/vjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MYxlK1lDMznL6; Fri, 23 Sep 2022 16:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28NG3PiS022278; Fri, 23 Sep 2022 16:03:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28NG3Pag022277; Fri, 23 Sep 2022 16:03:25 GMT (envelope-from git) Date: Fri, 23 Sep 2022 16:03:25 GMT Message-Id: <202209231603.28NG3Pag022277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 62a7dae44dfb - main - release: Use standard mount points for arm MBR boot images List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62a7dae44dfb38b6ef8b547a57dfb8b65dbc3943 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663949005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ZzHiBrho7Zl1j04rooesr1/hfK/X5ql1x6xjqE66yM=; b=GB95Dy32Cyggvw71fCeytuShNLvcdErEBFKaveqzqKAPXDKm1SUiJLY5iE7k2u+pKsjyzw kMoGatQFCiPZlfEkOMb5Lu6sCOlb0ea6VF+Fh6NJn27eBIi6f5OH7r8tll4szvdyZGv5kS HyH0k/w7VAXwhYfFfT6o7OPly/9zHNQ17PBGbxtA3WEIEKzC4SQmqEr4j7iwQfWa28v7vw y7ibBhSWTE19ppWS84gTPCUQpT7VMbGVYOSPxWlJWGc5atgXRTGd2Mt2woaS9H9vp9zB+F 9k8yR1hLNbc0c3wfamqZQuFJp4SUMrBkECuTN/9qwoLIgceP1bQuCDE/fgxLVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663949005; a=rsa-sha256; cv=none; b=hHKKBTW9ciTMX3kYp3fgRAOVy2fIHqTKPxXLRKAqHsWQLKm1OORghe7YbJw7grcjPabNQI bDLnY5md0L1z1zWtNcyFtOjPCY3bGH9daI88B8EHeOESNAl+kPARXqc86XT1W8gnIeC3Iu SpsSl5JXkkQFYVqqz0R8iw6mZyDKg0EgNaQ2EVtmhsdVojb3clrzLl6IVq8j6mhjI1+hhs go8O9R2j0kSjoUTX0PdznNrnjMEybozaWfsPr0VbSM9yGe3vQaqfg7l4Zlg3j/ZYIJItRd zdIGKcf7NahgkAjSIqGp4GYekT0l6qYrC2erk4Vd3D9RtKp3LXp+BVxxyV8gBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=62a7dae44dfb38b6ef8b547a57dfb8b65dbc3943 commit 62a7dae44dfb38b6ef8b547a57dfb8b65dbc3943 Author: Warner Losh AuthorDate: 2022-09-23 15:48:26 +0000 Commit: Warner Losh CommitDate: 2022-09-23 15:53:55 +0000 release: Use standard mount points for arm MBR boot images Traditionally, we've used /boot/msdos for the MBR mount point for the SD images that we produced. For GPT and bsdinstall, we've used /boot/efi. Migrate to using /boot/efi for MBR as well and add a /boot/msdos -> /boot/efi symlink for compatibility (which may disappear before 14.0, but will remain on the stable branches). When we first created the arm images, there was no EFI booting and the FAT partion on an MBR image was used to hold the firmware, uboot.bin, SoC config files and ubldr. When we transitioned to uboot with EFI, we put the loader files in the same partition. Later we standardized on /boot/efi at about the same time we added GPT support to the RE produced images. We left the MRB case as /boot/msdos for legacy reasons and since it wasn't always EFI. Later, we dropped support of non-EFI booting on the RE produced images, so the duality of /boot/msdos diminished even more. Since so little secondary meaning remains, putting it all in /boot/efi standardizes the location and reflects the RE images better as using efi-only booting. In addition, always label the msdosfs partion 'efi'. While a small misnomer on some systems that store other files in the ESP, it was requested in review for more consistency for similar reasons to the mountpoint rename. There was no way to have an 'alias' or 'second label' here, so this breaks compatibility. Since the images are self-contained, this was judged to be an acceptable change. Sponsored by: Netflix Reviewed by: manu, allanjude, emaste, gjb Differential Revision: https://reviews.freebsd.org/D36635 --- release/tools/arm.subr | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/release/tools/arm.subr b/release/tools/arm.subr index d07dbb41b48b..9e0704d7c95d 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -78,7 +78,7 @@ arm_create_disk() { if [ "${PART_SCHEME}" = "MBR" ]; then chroot ${CHROOTDIR} gpart add -t '!12' -a 512k -s ${FAT_SIZE} ${mddev} chroot ${CHROOTDIR} gpart set -a active -i 1 ${mddev} - chroot ${CHROOTDIR} newfs_msdos -L msdosboot -F ${FAT_TYPE} /dev/${mddev}s1 + chroot ${CHROOTDIR} newfs_msdos -L efi -F ${FAT_TYPE} /dev/${mddev}s1 chroot ${CHROOTDIR} gpart add -t freebsd ${mddev} chroot ${CHROOTDIR} gpart create -s bsd ${mddev}s2 chroot ${CHROOTDIR} gpart add -t freebsd-ufs -a 64k -b 64k ${mddev}s2 @@ -189,7 +189,8 @@ arm_install_base() { DESTDIR=${DESTDIR} KERNCONF=${KERNEL} \ ${CONF_FILES} installworld installkernel distribution chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/efi - chroot ${CHROOTDIR} mkdir -p ${DESTDIR}/boot/msdos + # Compatibility symlink to /boot/msdos for 13.1 and earlier + chroot ${CHROOTDIR} ln -s ${DESTDIR}/boot/efi ${DESTDIR}/boot/msdos arm_create_user arm_setup_usb_otg @@ -209,7 +210,7 @@ arm_install_base() { if [ "${PART_SCHEME}" = "MBR" ]; then echo "/dev/ufs/rootfs / ufs rw 1 1" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab - echo "/dev/msdosfs/MSDOSBOOT /boot/msdos msdosfs rw,noatime 0 0" \ + echo "/dev/msdosfs/EFI /boot/efi msdosfs rw,noatime 0 0" \ >> ${CHROOTDIR}/${DESTDIR}/etc/fstab fi echo "tmpfs /tmp tmpfs rw,mode=1777 0 0" \