From owner-svn-src-head@FreeBSD.ORG Mon May 20 20:32:59 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A377CFEE; Mon, 20 May 2013 20:32:59 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 9542DEFF; Mon, 20 May 2013 20:32:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4KKWx2A039376; Mon, 20 May 2013 20:32:59 GMT (envelope-from brooks@svn.freebsd.org) Received: (from brooks@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4KKWx7e039375; Mon, 20 May 2013 20:32:59 GMT (envelope-from brooks@svn.freebsd.org) Message-Id: <201305202032.r4KKWx7e039375@svn.freebsd.org> From: Brooks Davis Date: Mon, 20 May 2013 20:32:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250830 - head/tools/tools/makeroot X-SVN-Group: head 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.14 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: Mon, 20 May 2013 20:32:59 -0000 Author: brooks Date: Mon May 20 20:32:58 2013 New Revision: 250830 URL: http://svnweb.freebsd.org/changeset/base/250830 Log: Cleanups and markup improvements suggested by trociny and joel. Modified: head/tools/tools/makeroot/makeroot.8 Modified: head/tools/tools/makeroot/makeroot.8 ============================================================================== --- head/tools/tools/makeroot/makeroot.8 Mon May 20 20:14:12 2013 (r250829) +++ head/tools/tools/makeroot/makeroot.8 Mon May 20 20:32:58 2013 (r250830) @@ -28,7 +28,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd May 16, 2013 +.Dd May 20, 2013 .Dt MAKEROOT 8 .Os .Sh NAME @@ -52,12 +52,11 @@ script creates a UFS filesystem image in .Ar imagefile . By default, all filesystem objects listed in the -METALOG file contained in the -.Pa Ar rootdir +.Pa METALOG +file contained in the +.Ar rootdir directory will be placed in the root of the UFS image .Ar image-file . -will be placed in the root of the UFS image -.Ar image-file . .Pp Images can be customized with a number of different flags: .Bl -tag -width indent @@ -111,6 +110,14 @@ argument is passed directly to .El .Sh EXAMPLES .Dl $ makeroot.sh -k keys -K ctsrd -p extras/etc/master.passwd -g extras/etc/group -e extras/mdroot.mtree -e demo/demo.mtree -e extras/ctsrd.mtree -s 26112k -f demo.files cheribsd-demo.img /path/to/dist +.Sh FILES +.Bl -tag -width METALOG -compact +.It Pa METALOG +.Xr mtree 5 +2.0 format manifest of permissions and ownership for files in the root +directory. +This file is generated by installworld, distribution, and installkernel. +.El .Sh SEE ALSO .Xr mtree 5 , .Xr makefs 8 ,