diff --git a/tools/tools/nanobsd/Files/root/save_cfg b/tools/tools/nanobsd/Files/root/save_cfg
index 1931e5c79923..24f812197a68 100644
--- a/tools/tools/nanobsd/Files/root/save_cfg
+++ b/tools/tools/nanobsd/Files/root/save_cfg
@@ -1,117 +1,117 @@
 #!/bin/sh
 #
 # Copyright (c) 2006 Mathieu Arnold
 # Copyright (c) 2010 Alex Bakhtin
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 #
 
 set -e
 
 trap "umount /cfg" 1 2 15 EXIT
 mount /cfg
 (
 cd /etc
 for filename in "$@" `find * -type f`
 do
 	if [ ! -f /cfg/$filename -a ! -f /cfg/.ignore/$filename ]
 	then
 
 		#
 		# If file doesn't exist in /cfg and file is not in the 'ignore' list
 		# then check if this file is exactly the same as original file
 		# in nanobsd image
 		#
 		if ! cmp -s /etc/$filename /conf/base/etc/$filename 
 		then
 			file_path=`echo "$filename" | sed 's/\/[^/]*$//'`
 			if [ $file_path != $filename ]
 			then
 				if [ ! -d /etc/$file_path ]
 				then
 					# should never go here unless we have some errors in
 					# sed script extracting file path
 					echo "Error: Path /etc/$file_path is not directory."
 					exit 1;
 				fi
 			fi
 
 			#
 			# Ask user - how should we handle this file.
 			# Add to cfg (y/n/i)?
 			#	y) -> save this file in /cfg
 			#	n) -> do not save this file in /cfg for current script invocation ONLY
-			#	i) -> add file to ignore list (/cfg/.ignore hiereachy) and never save
+			#	i) -> add file to ignore list (/cfg/.ignore hierarchy) and never save
 			#	      try to add this file to /cfg.
 			#
 			# touch is used to add files to /cfg to keep the script flow straight and easy
 			#
 			read -p "New file /etc/$filename found. Add to /cfg (y/n/i)? " key
 			case "$key" in
 			[yY])
 				if [ $file_path != $filename ]
 				then
 					mkdir -vp /cfg/$file_path
 				fi
 				touch /cfg/$filename && echo "File /etc/$filename added to /cfg."
 				;;
 			[iI])
 				mkdir -vp /cfg/.ignore
 				if [ $file_path != $filename ]
 				then
 					mkdir -vp /cfg/.ignore/$file_path
 				fi
 				touch /cfg/.ignore/$filename && echo "File /etc/$filename added to ignore list."
 				;;
 			esac
 		fi
 	fi
 done
 
 #
 # Actually check all files in /cfg and save if necessary
 #
 cd /cfg
 for filename in "$@" `find * -type f`
 do
 	if [ -f /etc/$filename ]
 	then
         	cmp -s /etc/$filename /cfg/$filename || cp -pfv /etc/$filename /cfg/$filename
 	else
 
 		#
 		# Give user an option to remove file from /cfg if this file is removed from /etc
 		#
 		read -p "File /cfg/$filename not found in /etc. Remove from /cfg (y/n)? " key
 		case "$key" in
 		[yY])
 			rm /cfg/$filename && echo "File /cfg/$filename removed"
 			;;
 		esac
 	fi
 done
 
 )
 umount /cfg
 trap 1 2 15 EXIT
diff --git a/tools/tools/nanobsd/defaults.sh b/tools/tools/nanobsd/defaults.sh
index 5cb137a1db94..4ba35ffeb04d 100755
--- a/tools/tools/nanobsd/defaults.sh
+++ b/tools/tools/nanobsd/defaults.sh
@@ -1,976 +1,976 @@
 #!/bin/sh
 #
 # Copyright (c) 2005 Poul-Henning Kamp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 #
 
 set -e
 
 #######################################################################
 #
 # Setup default values for all controlling variables.
 # These values can be overridden from the config file(s)
 #
 #######################################################################
 
 # Name of this NanoBSD build.  (Used to construct workdir names)
 NANO_NAME=full
 
 # Source tree directory
 NANO_SRC=/usr/src
 
 # Where nanobsd additional files live under the source tree
 NANO_TOOLS=tools/tools/nanobsd
 
 # Where cust_pkgng() finds packages to install
 NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg
 NANO_PACKAGE_LIST="*"
 
 # where package metadata gets placed
 NANO_PKG_META_BASE=/var/db
 
 # Path to mtree file to apply to anything copied by cust_install_files().
 # If you specify this, the mtree file *must* have an entry for every file and
 # directory located in Files.
 #NANO_CUST_FILES_MTREE=""
 
 # Object tree directory
 # default is subdir of /usr/obj
 #NANO_OBJ=""
 
 # The directory to put the final images
 # default is ${NANO_OBJ}
 #NANO_DISKIMGDIR=""
 
 # Make & parallel Make
 NANO_MAKE="make"
 NANO_NCPU=$(sysctl -n hw.ncpu)
 
 # The default name for any image we create.
 NANO_IMGNAME="_.disk.full"
 NANO_IMG1NAME="_.disk.image"
 
 # Options to put in make.conf during buildworld only
 CONF_BUILD=' '
 
 # Options to put in make.conf during installworld only
 CONF_INSTALL=' '
 
 # Options to put in make.conf during both build- & installworld.
 CONF_WORLD=' '
 
 # Kernel config file to use
 NANO_KERNEL=GENERIC
 
 # Kernel modules to install. If empty, no modules are installed.
 # Use "default" to install all built modules.
 NANO_MODULES=
 
 # Early customize commands.
 NANO_EARLY_CUSTOMIZE=""
 
 # Customize commands.
 NANO_CUSTOMIZE=""
 
 # Late customize commands.
 NANO_LATE_CUSTOMIZE=""
 
 # Newfs parameters to use
 NANO_NEWFS="-b 4096 -f 512 -i 8192 -U"
 
 # The drive name of the media at runtime
 NANO_DRIVE=ada0
 
 # Target media size in 512 bytes sectors
 NANO_MEDIASIZE=2000000
 
 # Number of code images on media (1 or 2)
 NANO_IMAGES=2
 
 # 0 -> Leave second image all zeroes so it compresses better.
 # 1 -> Initialize second image with a copy of the first
 NANO_INIT_IMG2=1
 
 # Size of code file system in 512 bytes sectors
 # If zero, size will be as large as possible.
 NANO_CODESIZE=0
 
 # Size of configuration file system in 512 bytes sectors
 # Cannot be zero.
 NANO_CONFSIZE=2048
 
 # Size of data file system in 512 bytes sectors
 # If zero: no partition configured.
 # If negative: max size possible
 NANO_DATASIZE=0
 
 # Size of the /etc ramdisk in 512 bytes sectors
 NANO_RAM_ETCSIZE=10240
 
 # Size of the /tmp+/var ramdisk in 512 bytes sectors
 NANO_RAM_TMPVARSIZE=10240
 
 # boot0 flags/options and configuration
 NANO_BOOT0CFG="-o packet -s 1 -m 3"
 NANO_BOOTLOADER="boot/boot0sio"
 
 # boot2 flags/options
 # default force serial console
 NANO_BOOT2CFG="-h -S115200"
 
 # Backing type of md(4) device
 # Can be "file" or "swap"
 NANO_MD_BACKING="file"
 
 # for swap type md(4) backing, write out the mbr only
 NANO_IMAGE_MBRONLY=true
 
 # Progress Print level
 PPLEVEL=3
 
 # Set NANO_LABEL to non-blank to form the basis for using /dev/ufs/label
 # in preference to /dev/${NANO_DRIVE}
 # Root partition will be ${NANO_LABEL}s{1,2}
 # /cfg partition will be ${NANO_LABEL}s3
 # /data partition will be ${NANO_LABEL}s4
 NANO_LABEL=""
 NANO_SLICE_ROOT=s1
 NANO_SLICE_ALTROOT=s2
 NANO_SLICE_CFG=s3
 NANO_SLICE_DATA=s4
 NANO_PARTITION_ROOT=a
 NANO_PARTITION_ALTROOT=a
 NANO_ROOT=s1a
 NANO_ALTROOT=s2a
 
 # Default ownwership for nopriv build
 NANO_DEF_UNAME=root
 NANO_DEF_GNAME=wheel
 
 #######################################################################
 # Architecture to build.  Corresponds to TARGET_ARCH in a buildworld.
 # Unfortunately, there's no way to set TARGET at this time, and it
 # conflates the two, so architectures where TARGET != TARGET_ARCH and
 # TARGET can't be guessed from TARGET_ARCH do not work.  This defaults
 # to the arch of the current machine.
 NANO_ARCH=`uname -p`
 
 # CPUTYPE defaults to "" which is the default when CPUTYPE isn't
 # defined.
 NANO_CPUTYPE=""
 
 # Directory to populate /cfg from
 NANO_CFGDIR=""
 
 # Directory to populate /data from
 NANO_DATADIR=""
 
 # We don't need SRCCONF or SRC_ENV_CONF. NanoBSD puts everything we
 # need for the build in files included with __MAKE_CONF. Override in your
 # config file if you really must. We set them unconditionally here, though
 # in case they are stray in the build environment
 SRCCONF=/dev/null
 SRC_ENV_CONF=/dev/null
 
 # Comment this out if /usr/obj is a symlink
 # CPIO_SYMLINK=--insecure
 
 #######################################################################
 #
 # The functions which do the real work.
 # Can be overridden from the config file(s)
 #
 #######################################################################
 
 # Export values into the shell. Must use { } instead of ( ) like
 # other functions to avoid a subshell.
 # We set __MAKE_CONF as a global since it is easier to get quoting
 # right for paths with spaces in them.
 make_export ( ) {
 	# Similar to export_var, except puts the data out to stdout
 	var=$1
 	eval val=\$$var
 	echo "Setting variable: $var=\"$val\""
 	export $1
 }
 
 nano_make_build_env ( ) {
 	__MAKE_CONF="${NANO_MAKE_CONF_BUILD}"
 	make_export __MAKE_CONF
 }
 
 nano_make_install_env ( ) {
 	__MAKE_CONF="${NANO_MAKE_CONF_INSTALL}"
 	make_export __MAKE_CONF
 }
 
 # Extra environment variables for kernel builds
 nano_make_kernel_env ( ) {
 	if [ -f "${NANO_KERNEL}" ] ; then
 		KERNCONFDIR="$(realpath $(dirname ${NANO_KERNEL}))"
 		KERNCONF="$(basename ${NANO_KERNEL})"
 		make_export KERNCONFDIR
 		make_export KERNCONF
 	else
 		export KERNCONF="${NANO_KERNEL}"
 		make_export KERNCONF
 	fi
 }
 
 nano_global_make_env ( ) (
 	# global settings for the make.conf file, if set
 	[ -z "${NANO_ARCH}" ] || echo TARGET_ARCH="${NANO_ARCH}"
 	[ -z "${NANO_CPUTYPE}" ] || echo TARGET_CPUTYPE="${NANO_CPUTYPE}"
 )
 
 #
 # Create empty files in the target tree, and record the fact.  All paths
 # are relative to NANO_WORLDDIR.
 #
 tgt_touch ( ) (
 	cd "${NANO_WORLDDIR}"
 	for i; do
 		touch $i
 		echo "./${i} type=file" >> ${NANO_METALOG}
 	done
 )
 
 #
 # Convert a directory into a symlink. Takes two arguments, the
 # current directory and what it should become a symlink to. The
 # directory is removed and a symlink is created. If we're doing
 # a nopriv build, then append this fact to the metalog
 #
 tgt_dir2symlink ( ) (
 	dir=$1
 	symlink=$2
 
 	cd "${NANO_WORLDDIR}"
 	rm -xrf "$dir"
 	ln -s "$symlink" "$dir"
 	if [ -n "$NANO_METALOG" ]; then
 		echo "./${dir} type=link mode=0777 link=${symlink}" >> ${NANO_METALOG}
 	fi
 )
 
 # run in the world chroot, errors fatal
 CR ( ) {
 	chroot "${NANO_WORLDDIR}" /bin/sh -exc "$*"
 }
 
 # run in the world chroot, errors not fatal
 CR0 ( ) {
 	chroot "${NANO_WORLDDIR}" /bin/sh -c "$*" || true
 }
 
 clean_build ( ) (
 	pprint 2 "Clean and create object directory (${MAKEOBJDIRPREFIX})"
 
 	if ! rm -xrf ${MAKEOBJDIRPREFIX}/ > /dev/null 2>&1 ; then
 		chflags -R noschg ${MAKEOBJDIRPREFIX}/
 		rm -xr ${MAKEOBJDIRPREFIX}/
 	fi
 )
 
 make_conf_build ( ) (
 	pprint 2 "Construct build make.conf ($NANO_MAKE_CONF_BUILD)"
 
 	mkdir -p ${MAKEOBJDIRPREFIX}
 	printenv > ${MAKEOBJDIRPREFIX}/_.env
 
 	# Make sure we get all the global settings that NanoBSD wants
 	# in addition to the user's global settings
 	(
 	nano_global_make_env
 	echo "${CONF_WORLD}"
 	echo "${CONF_BUILD}"
 	) > ${NANO_MAKE_CONF_BUILD}
 )
 
 build_world ( ) (
 	pprint 2 "run buildworld"
 	pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.bw"
 
 	(
 	nano_make_build_env
 	set -o xtrace
 	cd "${NANO_SRC}"
 	${NANO_PMAKE} buildworld
 	) > ${MAKEOBJDIRPREFIX}/_.bw 2>&1
 )
 
 build_kernel ( ) (
 	pprint 2 "build kernel ($NANO_KERNEL)"
 	pprint 3 "log: ${MAKEOBJDIRPREFIX}/_.bk"
 
 	(
 	nano_make_build_env
 	nano_make_kernel_env
 
 	# Note: We intentionally build all modules, not only the ones in
 	# NANO_MODULES so the built world can be reused by multiple images.
 	# Although MODULES_OVERRIDE can be defined in the kernel config
 	# file to override this behavior. Just set NANO_MODULES=default.
 	set -o xtrace
 	cd "${NANO_SRC}"
 	${NANO_PMAKE} buildkernel
 	) > ${MAKEOBJDIRPREFIX}/_.bk 2>&1
 )
 
 clean_world ( ) (
 	if [ "${NANO_OBJ}" != "${MAKEOBJDIRPREFIX}" ]; then
 		pprint 2 "Clean and create object directory (${NANO_OBJ})"
 		if ! rm -xrf ${NANO_OBJ}/ > /dev/null 2>&1 ; then
 			chflags -R noschg ${NANO_OBJ}
 			rm -xr ${NANO_OBJ}/
 		fi
 		mkdir -p "${NANO_OBJ}" "${NANO_WORLDDIR}"
 		printenv > ${NANO_LOG}/_.env
 	else
 		pprint 2 "Clean and create world directory (${NANO_WORLDDIR})"
 		if ! rm -xrf "${NANO_WORLDDIR}/" > /dev/null 2>&1 ; then
 			chflags -R noschg "${NANO_WORLDDIR}"
 			rm -xrf "${NANO_WORLDDIR}/"
 		fi
 		mkdir -p "${NANO_WORLDDIR}"
 	fi
 )
 
 make_conf_install ( ) (
 	pprint 2 "Construct install make.conf ($NANO_MAKE_CONF_INSTALL)"
 
 	# Make sure we get all the global settings that NanoBSD wants
 	# in addition to the user's global settings
 	(
 	nano_global_make_env
 	echo "${CONF_WORLD}"
 	echo "${CONF_INSTALL}"
 	if [ -n "${NANO_NOPRIV_BUILD}" ]; then
 	    echo NO_ROOT=t
 	    echo METALOG=${NANO_METALOG}
 	fi
 	) >  ${NANO_MAKE_CONF_INSTALL}
 )
 
 install_world ( ) (
 	pprint 2 "installworld"
 	pprint 3 "log: ${NANO_LOG}/_.iw"
 
 	(
 	nano_make_install_env
 	set -o xtrace
 	cd "${NANO_SRC}"
 	${NANO_MAKE} installworld DESTDIR="${NANO_WORLDDIR}" DB_FROM_SRC=yes
 	chflags -R noschg "${NANO_WORLDDIR}"
 	) > ${NANO_LOG}/_.iw 2>&1
 )
 
 install_etc ( ) (
 	pprint 2 "install /etc"
 	pprint 3 "log: ${NANO_LOG}/_.etc"
 
 	(
 	nano_make_install_env
 	set -o xtrace
 	cd "${NANO_SRC}"
 	${NANO_MAKE} distribution DESTDIR="${NANO_WORLDDIR}" DB_FROM_SRC=yes
 	# make.conf doesn't get created by default, but some ports need it
 	# so they can spam it.
 	cp /dev/null "${NANO_WORLDDIR}"/etc/make.conf
 	) > ${NANO_LOG}/_.etc 2>&1
 )
 
 install_kernel ( ) (
 	pprint 2 "install kernel ($NANO_KERNEL)"
 	pprint 3 "log: ${NANO_LOG}/_.ik"
 
 	(
 
 	nano_make_install_env
 	nano_make_kernel_env
 
 	if [ "${NANO_MODULES}" != "default" ]; then
 		MODULES_OVERRIDE="${NANO_MODULES}"
 		make_export MODULES_OVERRIDE
 	fi
 
 	set -o xtrace
 	cd "${NANO_SRC}"
 	${NANO_MAKE} installkernel DESTDIR="${NANO_WORLDDIR}" DB_FROM_SRC=yes
 
 	) > ${NANO_LOG}/_.ik 2>&1
 )
 
 native_xtools ( ) (
 	pprint 2 "Installing the optimized native build tools for cross env"
 	pprint 3 "log: ${NANO_LOG}/_.native_xtools"
 
 	(
 
 	nano_make_install_env
 	set -o xtrace
 	cd "${NANO_SRC}"
 	${NANO_MAKE} native-xtools
 	${NANO_MAKE} native-xtools-install DESTDIR="${NANO_WORLDDIR}"
 
 	) > ${NANO_LOG}/_.native_xtools 2>&1
 )
 
 #
 # Run the requested set of early customization scripts, run before
 # buildworld.
 #
 run_early_customize ( ) {
 	pprint 2 "run early customize scripts"
 	for c in $NANO_EARLY_CUSTOMIZE
 	do
 		pprint 2 "early customize \"$c\""
 		pprint 3 "log: ${NANO_LOG}/_.early_cust.$c"
 		pprint 4 "`type $c`"
 		{ t=$(set -o | awk '$1 == "xtrace" && $2 == "off" { print "set +o xtrace"}');
 		  set -o xtrace ;
 		  $c ;
 		  eval $t
 		} >${NANO_LOG}/_.early_cust.$c 2>&1
 	done
 }
 
 #
 # Run the requested set of customization scripts, run after we've
 # done an installworld, installed the etc files, installed the kernel
 # and tweaked them in the standard way.
 #
 run_customize ( ) (
 
 	pprint 2 "run customize scripts"
 	for c in $NANO_CUSTOMIZE
 	do
 		pprint 2 "customize \"$c\""
 		pprint 3 "log: ${NANO_LOG}/_.cust.$c"
 		pprint 4 "`type $c`"
 		( set -o xtrace ; $c ) > ${NANO_LOG}/_.cust.$c 2>&1
 	done
 )
 
 #
 # Run any last-minute customization commands after we've had a chance to
 # setup nanobsd, prune empty dirs from /usr, etc
 #
 run_late_customize ( ) (
 	pprint 2 "run late customize scripts"
 	for c in $NANO_LATE_CUSTOMIZE
 	do
 		pprint 2 "late customize \"$c\""
 		pprint 3 "log: ${NANO_LOG}/_.late_cust.$c"
 		pprint 4 "`type $c`"
 		( set -o xtrace ; $c ) > ${NANO_LOG}/_.late_cust.$c 2>&1
 	done
 )
 
 #
 # Hook called after we run all the late customize commands, but
 # before we invoke the disk imager. The nopriv build uses it to
 # read in the meta log, apply the changes other parts of nanobsd
 # have been recording their actions. It's not anticipated that
 # a user's cfg file would override this.
 #
 fixup_before_diskimage ( ) (
-	# Run the deduplication script that takes the matalog journal and
+	# Run the deduplication script that takes the metalog journal and
 	# combines multiple entries for the same file (see source for
 	# details). We take the extra step of removing the size keywords. This
-	# script, and many of the user scripts, copies, appeneds and otherwise
+	# script, and many of the user scripts, copies, appends and otherwise
 	# modifies files in the build, changing their sizes.  These actions are
 	# impossible to trap, so go ahead remove the size= keyword. For this
 	# narrow use, it doesn't buy us any protection and just gets in the way.
 	# The dedup tool's output must be sorted due to limitations in awk.
 	if [ -n "${NANO_METALOG}" ]; then
 		pprint 2 "Fixing metalog"
 		cp ${NANO_METALOG} ${NANO_METALOG}.pre
 		echo "/set uname=${NANO_DEF_UNAME} gname=${NANO_DEF_GNAME}" > ${NANO_METALOG}
 		cat ${NANO_METALOG}.pre | ${NANO_TOOLS}/mtree-dedup.awk | \
 		    sed -e 's/ size=[0-9][0-9]*//' | sort >> ${NANO_METALOG}
 	fi
 )
 
 setup_nanobsd ( ) (
 	pprint 2 "configure nanobsd setup"
 	pprint 3 "log: ${NANO_LOG}/_.dl"
 
 	(
 	cd "${NANO_WORLDDIR}"
 
 	# Move /usr/local/etc to /etc/local so that the /cfg stuff
 	# can stomp on it.  Otherwise packages like ipsec-tools which
 	# have hardcoded paths under ${prefix}/etc are not tweakable.
 	if [ -d usr/local/etc ] ; then
 		(
 		cd usr/local/etc
 		find . -print | cpio ${CPIO_SYMLINK} -dumpl ../../../etc/local
 		cd ..
 		rm -xrf etc
 		)
 	fi
 
 	# Always setup the usr/local/etc -> etc/local symlink.
 	# usr/local/etc gets created by packages, but if no packages
 	# are installed by this point, but are later in the process,
 	# the symlink not being here causes problems. It never hurts
 	# to have the symlink in error though.
 	ln -s ../../etc/local usr/local/etc
 
 	for d in var etc
 	do
 		# link /$d under /conf
 		# we use hard links so we have them both places.
 		# the files in /$d will be hidden by the mount.
 		mkdir -p conf/base/$d conf/default/$d
 		find $d -print | cpio ${CPIO_SYMLINK} -dumpl conf/base/
 	done
 
 	echo "$NANO_RAM_ETCSIZE" > conf/base/etc/md_size
 	echo "$NANO_RAM_TMPVARSIZE" > conf/base/var/md_size
 
 	# pick up config files from the special partition
 	echo "mount -o ro /dev/${NANO_DRIVE}${NANO_SLICE_CFG}" > conf/default/etc/remount
 
 	# Put /tmp on the /var ramdisk (could be symlink already)
 	tgt_dir2symlink tmp var/tmp
 
 	) > ${NANO_LOG}/_.dl 2>&1
 )
 
 setup_nanobsd_etc ( ) (
 	pprint 2 "configure nanobsd /etc"
 
 	(
 	cd "${NANO_WORLDDIR}"
 
 	# create diskless marker file
 	touch etc/diskless
 
 	[ -n "${NANO_NOPRIV_BUILD}" ] && chmod 666 boot/defaults/loader.conf
 	{
 		echo
 		echo '###  NanoBSD configuration  ##################################'
 		echo 'hostuuid_load="NO"'
 		echo 'entropy_cache_load="NO"		# Disable loading cached entropy at boot time.'
 		echo 'kern.random.initial_seeding.disable_bypass_warnings="1"	# Do not log a warning'
 		echo "				# if the 'bypass_before_seeding' knob is enabled"
 		echo "				# and a request is submitted prior to initial"
 		echo "				# seeding."
 	} >> boot/defaults/loader.conf
 	[ -n "${NANO_NOPRIV_BUILD}" ] && chmod 444 boot/defaults/loader.conf
 
 	[ -n "${NANO_NOPRIV_BUILD}" ] && chmod 666 etc/defaults/rc.conf
 	if ! ed -s etc/defaults/rc.conf <<\EOF
 /^### Define source_rc_confs, the mechanism used by \/etc\/rc\.\* ##$/i
 ###  NanoBSD options  ########################################
 ##############################################################
 
 kldxref_enable="NO"	# Disable building linker.hints files with kldxref(8).
 root_rw_mount="NO"	# Inhibit remounting root read-write.
 entropy_boot_file="NO"	# Disable very early (used at early boot time)
 			# entropy caching through reboots.
 entropy_file="NO"	# Disable late (used when going multi-user)
 			# entropy through reboots.
 entropy_dir="NO"	# Disable caching entropy via cron.
 
 ##############################################################
 .
 w
 q
 EOF
 	then
 		echo "Regular expression pattern not found"
 		exit 2
 	fi
 	[ -n "${NANO_NOPRIV_BUILD}" ] && chmod 444 etc/defaults/rc.conf
 
 	# save config file for scripts
 	echo "NANO_DRIVE=${NANO_DRIVE}" > etc/nanobsd.conf
 
 	echo "/dev/${NANO_DRIVE}${NANO_ROOT} / ufs ro 1 1" > etc/fstab
 	echo "/dev/${NANO_DRIVE}${NANO_SLICE_CFG} /cfg ufs rw,noauto 2 2" >> etc/fstab
 	mkdir -p cfg
 
 	# Create directory for eventual /usr/local/etc contents
 	mkdir -p etc/local
 	)
 )
 
 prune_usr ( ) (
 	# Remove all empty directories in /usr
 	find "${NANO_WORLDDIR}"/usr -type d -depth -print |
 		while read d
 		do
 			rmdir $d > /dev/null 2>&1 || true
 		done
 )
 
 newfs_part ( ) (
 	local dev mnt lbl
 	dev=$1
 	mnt=$2
 	lbl=$3
 	echo newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev}
 	newfs ${NANO_NEWFS} ${NANO_LABEL:+-L${NANO_LABEL}${lbl}} ${dev}
 	mount -o async ${dev} ${mnt}
 )
 
 # Convenient spot to work around any umount issues that your build environment
 # hits by overriding this method.
 nano_umount ( ) (
 	umount ${1}
 )
 
 populate_slice ( ) (
 	local dev dir mnt lbl
 	dev=$1
 	dir=$2
 	mnt=$3
 	lbl=$4
 	echo "Creating ${dev} (mounting on ${mnt})"
 	newfs_part ${dev} ${mnt} ${lbl}
 	if [ -n "${dir}" -a -d "${dir}" ]; then
 		echo "Populating ${lbl} from ${dir}"
 		cd "${dir}"
 		find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -dumpv ${mnt}
 	fi
 	df -i ${mnt}
 	nano_umount ${mnt}
 )
 
 populate_cfg_slice ( ) (
 	populate_slice "$1" "$2" "$3" "$4"
 )
 
 populate_data_slice ( ) (
 	populate_slice "$1" "$2" "$3" "$4"
 )
 
 last_orders ( ) (
 	# Redefine this function with any last orders you may have
 	# after the build completed, for instance to copy the finished
 	# image to a more convenient place:
 	# cp ${NANO_DISKIMGDIR}/${NANO_IMG1NAME} /home/ftp/pub/nanobsd.disk
 	true
 )
 
 #######################################################################
 #
 # Optional convenience functions.
 #
 #######################################################################
 
 #######################################################################
 # Common Flash device geometries
 #
 
 FlashDevice ( ) {
 	if [ -d ${NANO_TOOLS} ] ; then
 		. ${NANO_TOOLS}/FlashDevice.sub
 	else
 		. ${NANO_SRC}/${NANO_TOOLS}/FlashDevice.sub
 	fi
 	sub_FlashDevice $1 $2
 }
 
 #######################################################################
 # USB device geometries
 #
 # Usage:
 #	UsbDevice Generic 1000	# a generic flash key sold as having 1GB
 #
 # This function will set NANO_MEDIASIZE, NANO_HEADS and NANO_SECTS for you.
 #
 # Note that the capacity of a flash key is usually advertised in MB or
 # GB, *not* MiB/GiB. As such, the precise number of cylinders available
 # for C/H/S geometry may vary depending on the actual flash geometry.
 #
 # The following generic device layouts are understood:
 #  generic           An alias for generic-hdd.
 #  generic-hdd       255H 63S/T xxxxC with no MBR restrictions.
 #  generic-fdd       64H 32S/T xxxxC with no MBR restrictions.
 #
 # The generic-hdd device is preferred for flash devices larger than 1GB.
 #
 
 UsbDevice ( ) {
 	a1=`echo $1 | tr '[:upper:]' '[:lower:]'`
 	case $a1 in
 	generic-fdd)
 		NANO_HEADS=64
 		NANO_SECTS=32
 		NANO_MEDIASIZE=$(( $2 * 1000 * 1000 / 512 ))
 		;;
 	generic|generic-hdd)
 		NANO_HEADS=255
 		NANO_SECTS=63
 		NANO_MEDIASIZE=$(( $2 * 1000 * 1000 / 512 ))
 		;;
 	*)
 		echo "Unknown USB flash device"
 		exit 2
 		;;
 	esac
 }
 
 #######################################################################
 # Setup serial console
 
 cust_comconsole ( ) (
 	# Enable getty on console
 	sed -i "" -e '/^tty[du]0/s/off/onifconsole/' ${NANO_WORLDDIR}/etc/ttys
 
 	# Disable getty on syscons or vt devices
 	sed -i "" -E '/^ttyv[0-8]/s/\ton(ifexists)?/\toff/' ${NANO_WORLDDIR}/etc/ttys
 
 	# Tell loader to use serial console early.
 	echo "${NANO_BOOT2CFG}" > ${NANO_WORLDDIR}/boot.config
 )
 
 #######################################################################
 # Allow root login via ssh
 
 cust_allow_ssh_root ( ) (
 	sed -i "" -E 's/^#?PermitRootLogin.*/PermitRootLogin yes/' \
 	    ${NANO_WORLDDIR}/etc/ssh/sshd_config
 )
 
 #######################################################################
 # Install the stuff under ./Files
 
 cust_install_files ( ) (
 	cd "${NANO_TOOLS}/Files"
 	find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)/' | cpio ${CPIO_SYMLINK} -Ldumpv ${NANO_WORLDDIR}
 
 	if [ -n "${NANO_CUST_FILES_MTREE}" -a -f ${NANO_CUST_FILES_MTREE} ]; then
 		CR "mtree -eiU -p /" <${NANO_CUST_FILES_MTREE}
 	fi
 )
 
 #######################################################################
 # Install packages from ${NANO_PACKAGE_DIR}
 
 cust_pkgng ( ) (
 	mkdir -p ${NANO_WORLDDIR}/usr/local/etc
 	local PKG_CONF="${NANO_WORLDDIR}/usr/local/etc/pkg.conf"
 	local PKGCMD="env BATCH=YES ASSUME_ALWAYS_YES=YES PKG_DBDIR=${NANO_PKG_META_BASE}/pkg SIGNATURE_TYPE=none /usr/sbin/pkg"
 
 	# Ensure pkg.conf points pkg to where the package meta data lives.
 	touch ${PKG_CONF}
 	if grep -Eiq '^PKG_DBDIR:.*' ${PKG_CONF}; then
 		sed -i -e "\|^PKG_DBDIR:.*|Is||PKG_DBDIR: "\"${NANO_PKG_META_BASE}/pkg\""|" ${PKG_CONF}
 	else
 		echo "PKG_DBDIR: \"${NANO_PKG_META_BASE}/pkg\"" >> ${PKG_CONF}
 	fi
 
 	# If the package directory doesn't exist, we're done.
 	NANO_PACKAGE_DIR="$(realpath $NANO_PACKAGE_DIR)"
 	if [ ! -d ${NANO_PACKAGE_DIR} ]; then
 		echo "DONE 0 packages"
 		return 0
 	fi
 
 	# Find a pkg-* package
 	for x in `find -s ${NANO_PACKAGE_DIR} -iname 'pkg-*'`; do
 		_NANO_PKG_PACKAGE=`basename "$x"`
 	done
 	if [ -z "${_NANO_PKG_PACKAGE}" -o ! -f "${NANO_PACKAGE_DIR}/${_NANO_PKG_PACKAGE}" ]; then
 		echo "FAILED: need a pkg/ package for bootstrapping"
 		exit 2
 	fi
 
 	# Mount packages into chroot
 	mkdir -p ${NANO_WORLDDIR}/_.p
 	mount -t nullfs -o noatime -o ro ${NANO_PACKAGE_DIR} ${NANO_WORLDDIR}/_.p
 	mount -t devfs devfs ${NANO_WORLDDIR}/dev
 
 	trap "umount ${NANO_WORLDDIR}/dev; umount ${NANO_WORLDDIR}/_.p ; rm -xrf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT
 
 	# Install pkg-* package
 	CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}"
 
 	(
-		# Expand any glob characters in pacakge list
+		# Expand any glob characters in package list
 		cd "${NANO_PACKAGE_DIR}"
 		_PKGS=`find ${NANO_PACKAGE_LIST} -not -name "${_NANO_PKG_PACKAGE}" -print | sort | uniq`
 
 		# Show todo
 		todo=`echo "$_PKGS" | wc -l`
 		echo "=== TODO: $todo"
 		echo "$_PKGS"
 		echo "==="
 
 		# Install packages
 		for _PKG in $_PKGS; do
 			CR "${PKGCMD} add /_.p/${_PKG}"
 		done
 	)
 
 	CR0 "${PKGCMD} info"
 
 	trap - 1 2 15 EXIT
 	umount ${NANO_WORLDDIR}/dev
 	umount ${NANO_WORLDDIR}/_.p
 	rm -xrf ${NANO_WORLDDIR}/_.p
 )
 
 #######################################################################
 # Convenience function:
 #	Register all args as early customize function to run just before
 #	build commences.
 
 early_customize_cmd ( ) {
 	NANO_EARLY_CUSTOMIZE="$NANO_EARLY_CUSTOMIZE $*"
 }
 
 #######################################################################
 # Convenience function:
 # 	Register all args as customize function.
 
 customize_cmd ( ) {
 	NANO_CUSTOMIZE="$NANO_CUSTOMIZE $*"
 }
 
 #######################################################################
 # Convenience function:
 # 	Register all args as late customize function to run just before
 #	image creation.
 
 late_customize_cmd ( ) {
 	NANO_LATE_CUSTOMIZE="$NANO_LATE_CUSTOMIZE $*"
 }
 
 #######################################################################
 #
 # All set up to go...
 #
 #######################################################################
 
 # Progress Print
 #	Print $2 at level $1.
 pprint ( ) (
     if [ "$1" -le $PPLEVEL ]; then
 	runtime=$(( `date +%s` - $NANO_STARTTIME ))
 	printf "%s %.${1}s %s\n" "`date -u -r $runtime +%H:%M:%S`" "#####" "$2" 1>&3
     fi
 )
 
 usage ( ) {
 	(
 	echo "Usage: $0 [-BbfhIiKknqvWwX] [-c config_file]"
 	echo "	-B	suppress installs (both kernel and world)"
 	echo "	-b	suppress builds (both kernel and world)"
 	echo "	-c	specify config file"
 	echo "	-f	suppress code slice extraction (implies -i)"
 	echo "	-h	print this help summary page"
 	echo "	-I	build disk image from existing build/install"
 	echo "	-i	suppress disk image build"
 	echo "	-K	suppress installkernel"
 	echo "	-k	suppress buildkernel"
 	echo "	-n	add -DNO_CLEAN to buildworld, buildkernel, etc"
 	echo "	-q	make output more quiet"
 	echo "	-v	make output more verbose"
 	echo "	-W	suppress installworld"
 	echo "	-w	suppress buildworld"
 	echo "	-X	make native-xtools"
 	) 1>&2
 	exit 2
 }
 
 #######################################################################
 # Setup and Export Internal variables
 #
 
-export_var ( ) {		# Don't wawnt a subshell
+export_var ( ) {		# Don't want a subshell
 	var=$1
 	# Lookup value of the variable.
 	eval val=\$$var
 	pprint 3 "Setting variable: $var=\"$val\""
 	export $1
 }
 
 # Call this function to set defaults _after_ parsing options.
-# dont want a subshell otherwise variable setting is thrown away.
+# don't want a subshell otherwise variable setting is thrown away.
 set_defaults_and_export ( ) {
 	: ${NANO_OBJ:=/usr/obj/nanobsd.${NANO_NAME}${NANO_LAYOUT:+.${NANO_LAYOUT}}}
 	: ${MAKEOBJDIRPREFIX:=${NANO_OBJ}}
 	: ${NANO_DISKIMGDIR:=${NANO_OBJ}}
 	: ${NANO_WORLDDIR:=${NANO_OBJ}/_.w}
 	: ${NANO_LOG:=${NANO_OBJ}}
 	: ${NANO_PMAKE:="${NANO_MAKE} -j ${NANO_NCPU}"}
 	if ! $do_clean; then
 		NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
 	fi
 	NANO_MAKE_CONF_BUILD=${MAKEOBJDIRPREFIX}/make.conf.build
 	NANO_MAKE_CONF_INSTALL=${NANO_OBJ}/make.conf.install
 
 	# Override user's NANO_DRIVE if they specified a NANO_LABEL
 	[ -n "${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}" || true
 
 	[ -n "${NANO_NOPRIV_BUILD}" ] && [ -z "${NANO_METALOG}" ] && \
 		NANO_METALOG=${NANO_OBJ}/_.metalog || true
 
 	NANO_STARTTIME=`date +%s`
 	pprint 3 "Exporting NanoBSD variables"
 	export_var MAKEOBJDIRPREFIX
 	export_var NANO_ARCH
 	export_var NANO_CODESIZE
 	export_var NANO_CONFSIZE
 	export_var NANO_CUSTOMIZE
 	export_var NANO_DATASIZE
 	export_var NANO_DRIVE
 	export_var NANO_HEADS
 	export_var NANO_IMAGES
 	export_var NANO_IMGNAME
 	export_var NANO_IMG1NAME
 	export_var NANO_MAKE
 	export_var NANO_MAKE_CONF_BUILD
 	export_var NANO_MAKE_CONF_INSTALL
 	export_var NANO_MEDIASIZE
 	export_var NANO_NAME
 	export_var NANO_NCPU
 	export_var NANO_NEWFS
 	export_var NANO_OBJ
 	export_var NANO_PMAKE
 	export_var NANO_SECTS
 	export_var NANO_SRC
 	export_var NANO_TOOLS
 	export_var NANO_WORLDDIR
 	export_var NANO_BOOT0CFG
 	export_var NANO_BOOTLOADER
 	export_var NANO_LABEL
 	export_var NANO_MODULES
 	export_var NANO_NOPRIV_BUILD
 	export_var NANO_METALOG
 	export_var NANO_LOG
 	export_var SRCCONF
 	export_var SRC_ENV_CONF
 }
diff --git a/tools/tools/nanobsd/fill_pkg.sh b/tools/tools/nanobsd/fill_pkg.sh
index 6734498350a9..17d163709f91 100644
--- a/tools/tools/nanobsd/fill_pkg.sh
+++ b/tools/tools/nanobsd/fill_pkg.sh
@@ -1,169 +1,169 @@
 #!/bin/sh
 #
 # Copyright (c) 2014 Lev Serebryakov.
 # Copyright (c) 2009 Poul-Henning Kamp.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 #
 # Usage:
 # 	$0 [-cv] PACKAGE_DUMP NANO_PACKAGE_DIR /usr/ports/foo/bar [package.pkg]...
 #
 # Will symlink/copy the packages listed, including their runtime dependencies,
 # from the PACKAGE_DUMP to the NANO_PACKAGE_DIR.
 #
 
 : ${PORTSDIR:=/usr/ports}
 
 usage () {
 	echo "Usage: $0 [-cv] package-dump-dir nano-package-dir port-dir-or-pkg ..." 1>&2
 	exit 2
 }
 
 msg () {
 	local l
 	l=$1 ; shift
 	[ "$l" -le "$VERBOSE" ] && echo $*
 }
 
 ports_recurse() (
 	local outputfile dumpdir type fullpath pkgname p
 	outputfile=$1 ; shift
 	dumpdir=$1    ; shift
 	for p do
 		if [ -d "$p" -a -f "$p/Makefile" ] ; then
 			msg 3 "$p: full path to port"
 			pkgname=`cd "$p" && make package-name`
 			type=port
 			fullpath=$p
 		elif [ -d "${PORTSDIR}/$p" -a -f "${PORTSDIR}/$p/Makefile" ] ; then
 			msg 3 "$p: path to port relative to ${PORTSDIR}}"
 			pkgname=`cd "${PORTSDIR}/$p" && make package-name`
 			type=port
 			fullpath=${PORTSDIR}/$p
 		elif [ "${p%.pkg}" != "$p" -a -f "$p" ] && pkg info -F "$p" > /dev/null 2>&1 ; then
 			msg 3 "$p: full package file name"
 			pkgname=`basename "$p" | sed 's/\.pkg$//I'`
 			type=pkg
 			fullpath=$p
 		elif [ "${p%.pkg}" != "$p" -a -f "$dumpdir/$p" ] && pkg info -F "$dumpdir/$p" > /dev/null 2>&1 ; then
 			msg 3 "$p: package file name relative to $dumpdir"
 			pkgname=`basename "$p" | sed 's/\.pkg$//I'`
 			type=pkg
 			fullpath=$dumpdir/$p
 		elif [ -f "$dumpdir/$p.pkg" ] && pkg info -F "$dumpdir/$p.pkg" > /dev/null 2>&1 ; then
 			msg 3 "$p: package name relative to $dumpdir"
 			pkgname=`basename "$p"`
 			type=pkg
 			fullpath=$dumpdir/$p.pkg
 		else
 			echo "Missing port or package $p" 1>&2
 			exit 2
 		fi
 		if grep -q "^$pkgname\$" "$outputfile" ; then
 			msg 3 "$pkgname was added already"
 			true
 		elif [ "$type" = "port" ] ; then
 			(
 				cd "$fullpath"
 				rd=`make -V RUN_DEPENDS ${PORTS_OPTS}`
 				ld=`make -V LIB_DEPENDS ${PORTS_OPTS}`
 
 				for dep in $rd $ld ; do
 					arg=`echo $dep | sed 's/^[^:]*:\([^:]*\).*$/\1/'`
 					msg 2 "Check $arg as requirement for port $pkgname"
 					ports_recurse "$outputfile" "$dumpdir" "$arg"
 				done
 			)
 			msg 1 "Add $pkgname"
 			echo "$pkgname" >> "$outputfile"
 		else
 			dir=`dirname "$p"` # Get directory from SPECIFIED path, not from full path
 			if [ "$dir" = "." ] ; then
 			  dir=""
 			else
 			  dir=${dir}/
 			fi
 			deps=`pkg info -dF "$fullpath" | grep -v "$pkgname:"`
 			for dep in $deps ; do
 				arg=`echo $dep | sed -e "s|^|$dir|" -e 's/$/.pkg/'`
 				msg 2 "Check $arg as requirement for package $pkgname"
 				ports_recurse "$outputfile" "$dumpdir" "$arg"
 			done
 			msg 1 "Add $pkgname"
 			echo "$pkgname" >> "$outputfile"
 		fi
 	done
 )
 
 COPY="ln -s"
 VERBOSE=0
 
 while getopts cv opt ; do
 	case "$opt" in
 	  c) COPY="cp -p"              ;;
 	  v) VERBOSE=$(($VERBOSE + 1)) ;;
 	[?]) usage                     ;;
 	esac
 done
 shift $(( ${OPTIND} - 1 ))
 
 if [ "$#" -lt 3 ] ; then
 	usage
 fi
 
 NANO_PKG_DUMP=`realpath $1`
 shift;
 if [ ! -d "$NANO_PKG_DUMP" ] ; then
 	echo "$NANO_PKG_DUMP is not a directory" 1>&2
 	usage
 fi
 
 NANO_PKG_DIR=`realpath $1`
 shift;
 if [ ! -d "$NANO_PKG_DIR" ] ; then
 	echo "$NANO_PKG_DIR is not a directory" 1>&2
 	usage
 fi
 
 # Cleanup
 rm -rf "$NANO_PKG_DIR/"*
 
 PL=$NANO_PKG_DIR/_list
 true > "$PL"
 
 for p do
 	ports_recurse "$PL" "$NANO_PKG_DUMP" "$p"
 done
 
 for i in `cat "$PL"` ; do
 	if [ -f "$NANO_PKG_DUMP/$i.pkg" ] ; then
 		$COPY "$NANO_PKG_DUMP/$i.pkg" "$NANO_PKG_DIR"
 	else
-		echo "Package $i misssing in $NANO_PKG_DUMP" 1>&2
+		echo "Package $i missing in $NANO_PKG_DUMP" 1>&2
 		exit 1
 	fi
 done
 
 rm -f "$PL"
 exit 0
diff --git a/tools/tools/nanobsd/mtree-dedup.awk b/tools/tools/nanobsd/mtree-dedup.awk
index e30f3100b4da..8840047f5318 100755
--- a/tools/tools/nanobsd/mtree-dedup.awk
+++ b/tools/tools/nanobsd/mtree-dedup.awk
@@ -1,200 +1,200 @@
 #!/usr/bin/awk -f
 
 #
 # Copyright (c) 2015 M. Warner Losh <imp@FreeBSD.org>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 #
 # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 # ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
 # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
 #
 
 #
 # Takes a meta-log created by installworld and friends, plus
 # additions from NanoBSD to augment its build to communicate when
 # files move around after installworld / installkernel phase of
 # NanoBSD.
 #
 # All mtree lines from the metafile have a path, followed by
 # a number of keywords.
 #
 # This script recognizes the following new keywords
 #
 # unlink[=x]	remove the path from the output.
 # copy_from=x	create new entry for path copied from
 #		the keywords from x.
 # move_from=x	create new entry for path copied from
 #		the keywords from x. Remove path from
 #		the output.
 #
 # In addition, when path matches a previous entry, the
 # new entry and previous entry are merged.
 #
 # Special note: when uid and uname are both present,
 # uid is ignored. Ditto gid/gname.
 #
 # Also, the paths above have to match exactly, so X
 # should start with "./".
 #
 
 function die(str)
 {
 	print str > "/dev/stderr";
 	exit 1;
 }
 
 function kv(str)
 {
 	if (split(str, xxx, "=") == 2) {
 		kv_key = xxx[1];
 		kv_value = xxx[2];
 	} else {
 		kv_key = str;
 		kv_value = nv;
 	}
 }
 
 # Output the mtree for path based on the kvs.
 function mtree_from_kvs(path, kvs)
 {
 	lv = path " ";
 	for (k in kvs) {
 		if (kvs[k] == nv)
 			lv = lv k " ";
 		else
 			lv = lv k "=" kvs[k] " ";
 	}
 	return lv;
 }
 
-# Parse the mtree line into path + KVs. Use a sentinal value
+# Parse the mtree line into path + KVs. Use a sentinel value
 # for a bare keyword, which is extremely unlikely to be used
 # for real.
 function line2kv(kvs, str)
 {
 	delete kvs;
 
 	n = split(str, yyy, " ");
 	for (i = 2; i <= n; i++) {
 		s = yyy[i];
 		if (split(s, xxx, "=") == 2)
 			kvs[xxx[1]] = xxx[2];
 		else
 			kvs[s] = nv;
 	}
 }
 
 
 # old += new
 function merge_kvs(old, new)
 {
 	for (k in new) {
 		# uname / uid -- last one wins.
 		if (k == "uid" && "uname" in old)
 			delete old["uname"]
 		if (k == "uname" && "uid" in old)
 			delete old["uid"];
 		# gname / gid -- last one wins.
 		if (k == "gid" && "gname" in old)
 			delete old["gname"]
 		if (k == "gname" && "gid" in old)
 			delete old["gid"];
 		# Otherwise newest value wins
 		old[k] = new[k];
 	}
 }
 
 # Process the line we've read in, per the comments below
 function process_line(path, new)
 {
 	# Clear kvs
 	line2kv(new_kvs, new);
 
 	if ("unlink" in new_kvs) {
 		# A file removed
 		# Sanity check to see if tree[path] exists? 
 		# Makes sure when foo/bar/baz exists and foo/bar
 		# unlinked, baz is gone (for all baz).
 		if (path !~ "^\./")
 			die("bad path in : " new);
 		delete tree[path];		# unlink
 		return;
 	# } else if (new_kvs["append_from"]) { # not implemented
 	} else if ("copy_from" in new_kvs) {
 		# A file copied from another location, preserve its
 		# attribute for new file.
 		# Also merge any new attributes from this line.
 		from = new_kvs["copy_from"];
 		if (from !~ "^\./")
 			die("bad path in : " new);
 		delete new_kvs["copy_from"];
 		line2kv(old_kvs, tree[from]);	# old_kvs = kv's in entry
 		merge_kvs(old_kvs, new_kvs);	# old_kvs += new_kvs
 		tree[path] = mtree_from_kvs(path, old_kvs);
 	} else if ("move_from" in new_kvs) {
 		# A file moved from another location, preserve its
 		# attribute for new file, and scrag old location
 		# Also merge any new attributes from this line.
 		from = new_kvs["move_from"];
 		if (from !~ "^\./")
 			die("bad path in : " new);
 		delete new_kvs["move_from"];
 		line2kv(old_kvs, tree[from]);	# old_kvs = kv's in entry
 		merge_kvs(old_kvs, new_kvs);	# old_kvs += new_kvs
 		tree[path] = mtree_from_kvs(path, old_kvs);
 		delete tree[from];		# unlink
 	} else if (tree[path]) {	# Update existing entry with new line
 		line2kv(old_kvs, tree[path]);	# old_kvs = kv's in entry
 		merge_kvs(old_kvs, new_kvs);	# old_kvs += new_kvs
 		tree[path] = mtree_from_kvs(path, old_kvs);
 	} else {			# Add entry plus defaults
 		delete old_kvs;
 		merge_kvs(old_kvs, defaults);
 		merge_kvs(old_kvs, new_kvs);
 		tree[path] = mtree_from_kvs(path, old_kvs);
 	}
 }
 
 BEGIN {
 	nv = "___NO__VALUE___";
 
 	while ((getline < "/dev/stdin") > 0) {
 		if ($1 ~ "^#")
 			continue;
 		if ($1 == "/set") {
 			for (i = 2; i <= NF; i++) {
 				kv($i);
 				defaults[kv_key] = kv_value;
 			}
 		} else if ($1 == "/unset") {
 			for (i = 2; i <= NF; i++) {
 				kv($i);
 				delete defaults[kv_key];
 			}
 		} else
 			process_line($1, $0);
 	}
 
 	# Print the last set of defaults. This will carry
 	# over, I think, to makefs' defaults
 	print mtree_from_kvs("/set", defaults)
 	for (x in tree)
 		print tree[x];
 }