From owner-svn-src-head@FreeBSD.ORG  Wed Jan 30 17:39:44 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 35AD98AC;
 Wed, 30 Jan 2013 17:39:44 +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 27369ACE;
 Wed, 30 Jan 2013 17:39:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0UHdiAL024604;
 Wed, 30 Jan 2013 17:39:44 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0UHdiZK024603;
 Wed, 30 Jan 2013 17:39:44 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301301739.r0UHdiZK024603@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 30 Jan 2013 17:39:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246127 - head/etc
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Jan 2013 17:39:44 -0000

Author: brooks
Date: Wed Jan 30 17:39:43 2013
New Revision: 246127
URL: http://svnweb.freebsd.org/changeset/base/246127

Log:
  When adding the directory ownership to the METALOG do it by name rather
  than number as is done in install so as to differ binding of names to
  ids.
  
  Remove the -W flag from the mtree command so that the correct user and
  group is recorded rather than the default.

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Wed Jan 30 16:08:05 2013	(r246126)
+++ head/etc/Makefile	Wed Jan 30 17:39:43 2013	(r246127)
@@ -348,9 +348,10 @@ distrib-dirs:
 		test "$$d" == "/" && d=""; \
 		d=${DISTBASE}$$d; \
 		shift; \
-		${ECHO} "${MTREE_CMD} -C -f $$m | sed s#^\.#.$$d# |" \
-		    "${METALOG.add}" ; \
-		${MTREE_CMD} -C -f $$m | sed s#^\.#.$$d# | ${METALOG.add} ; \
+		${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
+		    "sed s#^\.#.$$d# | ${METALOG.add}" ; \
+		${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
+		    ${METALOG.add} ; \
 	done; true
 .endif
 	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys