From 8caedc2a57834d003127e32c17bc149271d856c2 Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 30 Jan 2013 17:39:43 +0000
Subject: [PATCH] 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.
---
 etc/Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index dfa99532c960..81ef45a09f1d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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