From owner-svn-src-head@freebsd.org Wed Nov 20 21:06:30 2019 Return-Path: Delivered-To: svn-src-head@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 7E2301C195A; Wed, 20 Nov 2019 21:06:30 +0000 (UTC) (envelope-from imp@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) server-signature RSA-PSS (4096 bits) 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 47JFc62XNGz4KnV; Wed, 20 Nov 2019 21:06:30 +0000 (UTC) (envelope-from imp@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 371598C1; Wed, 20 Nov 2019 21:06:30 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAKL6T3A043544; Wed, 20 Nov 2019 21:06:29 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAKL6T8U043541; Wed, 20 Nov 2019 21:06:29 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201911202106.xAKL6T8U043541@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 20 Nov 2019 21:06:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354915 - in head: etc/mtree share/man/man7 share/mk X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head: etc/mtree share/man/man7 share/mk X-SVN-Commit-Revision: 354915 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2019 21:06:30 -0000 Author: imp Date: Wed Nov 20 21:06:29 2019 New Revision: 354915 URL: https://svnweb.freebsd.org/changeset/base/354915 Log: Standardize EFI's ESP mount point. Mount the UEFI ESP on /boot/efi. No current system uses this by default, but there are many ad-hoc schemes that do this in /efi or /esp or /uefi and adding a new directory at the top-level would have a much higher likelihood of collision. Document this in /etc/mtree/BSD.root.mtree and create EFIDIR and related variables in bsd.own.mk. Differential Revision: https://reviews.freebsd.org/D21344 Modified: head/etc/mtree/BSD.root.dist head/share/man/man7/hier.7 head/share/mk/bsd.own.mk Modified: head/etc/mtree/BSD.root.dist ============================================================================== --- head/etc/mtree/BSD.root.dist Wed Nov 20 20:00:03 2019 (r354914) +++ head/etc/mtree/BSD.root.dist Wed Nov 20 21:06:29 2019 (r354915) @@ -18,6 +18,8 @@ rockchip tags=package=runtime .. .. + efi + .. firmware .. lua Modified: head/share/man/man7/hier.7 ============================================================================== --- head/share/man/man7/hier.7 Wed Nov 20 20:00:03 2019 (r354914) +++ head/share/man/man7/hier.7 Wed Nov 20 21:06:29 2019 (r354915) @@ -53,6 +53,8 @@ Compiled flattened device tree (FDT) files; see .Xr fdt 4 and .Xr dtc 1 +.It Pa efi/ +Mount point for EFI System Partition (ESP) on UEFI systems. .It Pa firmware/ loadable kernel modules containing binary firmware for hardware that needs firmware downloaded to it to function Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Wed Nov 20 20:00:03 2019 (r354914) +++ head/share/mk/bsd.own.mk Wed Nov 20 21:06:29 2019 (r354915) @@ -56,6 +56,15 @@ # KMODMODE KLD mode. [${BINMODE}] # # +# EFIDIR Base path for the UEFI ESP [/boot/efi] +# +# EFIOWN EFIDIR owner. [root] +# +# EFIGRP EFIDIR group. [wheel] +# +# EFIMODE EFIDIR mode. [555] +# +# # SHAREDIR Base path for architecture-independent ascii # text files. [/usr/share] # @@ -169,6 +178,10 @@ DTBODIR?= /boot/dtb/overlays DTBOWN?= root DTBGRP?= wheel DTBMODE?= 444 +EFIDIR?= /boot/efi +EFIOWN?= root +EFIGRP?= wheel +EFIMODE?= 555 # Use make.conf / environment LIBDIR as default if set... .if !empty(_PREMK_LIBDIR)