From 07d3d9969ebaa2f7f791885debcd43dbda0bc255 Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Wed, 27 May 2015 09:27:40 +0000
Subject: [PATCH] Pass -U to maketars if we are not building as root.

---
 distrib/common/Makefile.bootcd | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/distrib/common/Makefile.bootcd b/distrib/common/Makefile.bootcd
index 3b42213b104c..0976c463db0c 100644
--- a/distrib/common/Makefile.bootcd
+++ b/distrib/common/Makefile.bootcd
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.bootcd,v 1.28 2015/05/25 15:38:33 martin Exp $
+#	$NetBSD: Makefile.bootcd,v 1.29 2015/05/27 09:27:40 martin Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -78,8 +78,10 @@ _CDMAKEFSOPTIONS=	rockridge,label=${ISO_VOLID},publisher=${PUBLISHER}
 
 .if ${MKUNPRIVED} == "no"
 CD_METALOG.unpriv=
+mtunpriv=""
 .else
 CD_METALOG.unpriv=-M ${METALOG}.sanitised
+mtunpriv="-U"
 .endif
 
 # Stuff that should come from elsewhere - XXX where? - HF
@@ -248,7 +250,7 @@ copy-releasedir:
 		${CHMOD} +w ${CUROBJDIR:Q}/cdrom/etc/mtree/set.${set};	\
 	fi;								\
 	${CDSETSCMD} ./maketars -i "${CUROBJDIR}/cdrom"			\
-	    ${CD_METALOG.unpriv} -N ${NETBSDSRCDIR}/etc			\
+	    ${CD_METALOG.unpriv} ${mtunpriv} -N ${NETBSDSRCDIR}/etc	\
 	    -F "${CUROBJDIR}/cdrom/etc/mtree"				\
 	    -d "${DESTDIR:S,^$,/,}" ${set}
 .endfor