From c275d9ec22d91fe34fb620fe97e67a69c097ca39 Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 5 Dec 2015 01:10:04 +0000
Subject: [PATCH] Setting NANO_NOPRIV_BUILD will now add -DNO_ROOT and
 METALOG=xxxx as appropriate. First step in supporting a build w/o root. More
 to follow as actions by customization scripts are not (yet) recorded in the
 metalog, and duplicate entries in it aren't removed.

---
 tools/tools/nanobsd/defaults.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index 0d8584b69034..cd4d921c1f05 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -340,6 +340,10 @@ make_conf_install ( ) (
 	nano_global_make_env
 	echo "${CONF_WORLD}"
 	echo "${CONF_INSTALL}"
+	if [ ! -z "${NANO_NOPRIV_BUILD}" ]; then
+	    echo NO_ROOT=t
+	    echo METALOG=${NANO_METALOG}
+	fi
 	) >  ${NANO_MAKE_CONF_INSTALL}
 )
 
@@ -951,11 +955,14 @@ set_defaults_and_export ( ) {
 	NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install
 
 	# Override user's NANO_DRIVE if they specified a NANO_LABEL
-	[ ! -z "${NANO_LABEL}" ] && NANO_DRIVE="ufs/${NANO_LABEL}"
+	[ ! -z "${NANO_LABEL}" ] && NANO_DRIVE="ufs/${NANO_LABEL}" || true
 
 	# Set a default NANO_TOOLS to NANO_SRC/NANO_TOOLS if it exists.
 	[ ! -d "${NANO_TOOLS}" ] && [ -d "${NANO_SRC}/${NANO_TOOLS}" ] && \
-		NANO_TOOLS="${NANO_SRC}/${NANO_TOOLS}"
+		NANO_TOOLS="${NANO_SRC}/${NANO_TOOLS}" || true
+
+	[ ! -z "${NANO_NOPRIV_BUILD" ] && [ -z "${NANO_METALOG}"] && \
+		NANO_METALOG=${NANO_OBJ}/_.metalog || true
 
 	NANO_STARTTIME=`date +%s`
 	pprint 3 "Exporting NanoBSD variables"
@@ -985,6 +992,8 @@ set_defaults_and_export ( ) {
 	export_var NANO_BOOTLOADER
 	export_var NANO_LABEL
 	export_var NANO_MODULES
+	export_var NANO_NOPRIV_BUILD
+	export_var NANO_METALOG
 	export_var SRCCONF
 	export_var SRC_ENV_CONF
 }