From owner-svn-src-stable@freebsd.org Fri Apr 6 17:04:22 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55F63F965F6; Fri, 6 Apr 2018 17:04:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0AA6468E90; Fri, 6 Apr 2018 17:04:22 +0000 (UTC) (envelope-from kevans@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 059F814A66; Fri, 6 Apr 2018 17:04:22 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w36H4LxX056474; Fri, 6 Apr 2018 17:04:21 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w36H4Ler056471; Fri, 6 Apr 2018 17:04:21 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201804061704.w36H4Ler056471@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 6 Apr 2018 17:04:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r332116 - in stable/11: etc/mtree stand/defaults X-SVN-Group: stable-11 X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in stable/11: etc/mtree stand/defaults X-SVN-Commit-Revision: 332116 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@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Apr 2018 17:04:22 -0000 Author: kevans Date: Fri Apr 6 17:04:21 2018 New Revision: 332116 URL: https://svnweb.freebsd.org/changeset/base/332116 Log: MFC r331212,r331213: Move /boot/overlays to /boot/dtb/overlays r331212: Move /boot/overlays to /boot/dtb/overlays The former is fairly vague; these are FDT overlays to be applied to the running system, so /boot/dtb is a sensible location to put it without cluttering up /boot/dtb even further if desired. r331213: Amend missed reference to /boot/overlays Modified: stable/11/etc/mtree/BSD.root.dist stable/11/stand/defaults/loader.conf stable/11/stand/defaults/loader.conf.5 Directory Properties: stable/11/ (props changed) Modified: stable/11/etc/mtree/BSD.root.dist ============================================================================== --- stable/11/etc/mtree/BSD.root.dist Fri Apr 6 16:59:58 2018 (r332115) +++ stable/11/etc/mtree/BSD.root.dist Fri Apr 6 17:04:21 2018 (r332116) @@ -11,14 +11,14 @@ defaults .. dtb + overlays tags=package=runtime + .. .. firmware .. kernel .. modules - .. - overlays tags=package=runtime .. zfs .. Modified: stable/11/stand/defaults/loader.conf ============================================================================== --- stable/11/stand/defaults/loader.conf Fri Apr 6 16:59:58 2018 (r332115) +++ stable/11/stand/defaults/loader.conf Fri Apr 6 17:04:21 2018 (r332116) @@ -80,7 +80,7 @@ bootenv_autolist="YES" # Auto populate the list of ZF #comconsole_speed="9600" # Set the current serial console speed #console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device -module_path="/boot/modules;/boot/dtb;/boot/overlays" # Set the module search path +module_path="/boot/modules;/boot/dtb;/boot/dtb/overlays" # Set the module search path #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem Modified: stable/11/stand/defaults/loader.conf.5 ============================================================================== --- stable/11/stand/defaults/loader.conf.5 Fri Apr 6 16:59:58 2018 (r332115) +++ stable/11/stand/defaults/loader.conf.5 Fri Apr 6 17:04:21 2018 (r332116) @@ -284,7 +284,7 @@ that have no default value: .Bl -tag -width bootfile -offset indent .It Va fdt_overlays Specifies a comma-delimited list of FDT overlays to apply. -.Pa /boot/overlays +.Pa /boot/dtb/overlays is created by default for overlays to be placed in. .It Va kernels_autodetect If set to