Module Name: src
Committed By: martin
Date: Wed May 27 09:27:40 UTC 2015
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Pass -U to maketars if we are not building as root.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.28 src/distrib/common/Makefile.bootcd:1.29
--- src/distrib/common/Makefile.bootcd:1.28 Mon May 25 15:38:33 2015
+++ src/distrib/common/Makefile.bootcd Wed May 27 09:27:40 2015
@@ -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_
.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
