# HG changeset patch
# Parent 5300bd5667a44dbd7dae1e1093b1fd927398d1b4
diff -r 5300bd5667a4 -r 92eb3d65f8d2 tools/tools/nanobsd/fill_pkg.sh
--- a/tools/tools/nanobsd/fill_pkg.sh
+++ b/tools/tools/nanobsd/fill_pkg.sh
@@ -84,8 +84,8 @@ done
 for i in `cat $PL`
 do
 	p=`(cd $i && make -V PKGNAME)`
-	if [ -f $NANO_PKG_DUMP/$p.tbz ] ; then
-		ln -s $NANO_PKG_DUMP/$p.tbz $NANO_PACKAGE_DIR
+	if [ -f $NANO_PKG_DUMP/$p.txz ] ; then
+		ln -s $NANO_PKG_DUMP/$p.txz $NANO_PACKAGE_DIR
 	else
 		echo "Package $p misssing in $NANO_PKG_DUMP" 1>&2
 		exit 1
diff -r 5300bd5667a4 -r 92eb3d65f8d2 tools/tools/nanobsd/nanobsd.sh
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -45,7 +45,7 @@ NANO_SRC=/usr/src
 # Where nanobsd additional files live under the source tree
 NANO_TOOLS=tools/tools/nanobsd
 
-# Where cust_pkg() finds packages to install
+# Where cust_pkgng() finds packages to install
 NANO_PACKAGE_DIR=${NANO_SRC}/${NANO_TOOLS}/Pkg
 NANO_PACKAGE_LIST="*"
 
@@ -758,58 +758,6 @@ cust_install_files () (
 	find . -print | grep -Ev '/(CVS|\.svn|\.hg|\.git)' | cpio -Ldumpv ${NANO_WORLDDIR}
 )
 
-#######################################################################
-# Install packages from ${NANO_PACKAGE_DIR}
-
-cust_pkg () (
-
-	# If the package directory doesn't exist, we're done.
-	if [ ! -d ${NANO_PACKAGE_DIR} ]; then
-		echo "DONE 0 packages"
-		return 0
-	fi
-
-	# Copy packages into chroot
-	mkdir -p ${NANO_WORLDDIR}/Pkg ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg
-	(
-		cd ${NANO_PACKAGE_DIR}
-		find ${NANO_PACKAGE_LIST} -print |
-		    cpio -Ldumpv ${NANO_WORLDDIR}/Pkg
-	)
-
-	# Count & report how many we have to install
-	todo=`ls ${NANO_WORLDDIR}/Pkg | wc -l`
-	echo "=== TODO: $todo"
-	ls ${NANO_WORLDDIR}/Pkg
-	echo "==="
-	while true
-	do
-		# Record how many we have now
-		have=`ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg | wc -l`
-
-		# Attempt to install more packages
-		# ...but no more than 200 at a time due to pkg_add's internal
-		# limitations.
-		CR0 'ls Pkg/*tbz | xargs -n 200 env PKG_DBDIR='${NANO_PKG_META_BASE}'/pkg pkg_add -v -F'
-
-		# See what that got us
-		now=`ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg | wc -l`
-		echo "=== NOW $now"
-		ls ${NANO_WORLDDIR}/${NANO_PKG_META_BASE}/pkg
-		echo "==="
-
-
-		if [ $now -eq $todo ] ; then
-			echo "DONE $now packages"
-			break
-		elif [ $now -eq $have ] ; then
-			echo "FAILED: Nothing happened on this pass"
-			exit 2
-		fi
-	done
-	nano_rm -rf ${NANO_WORLDDIR}/Pkg
-)
-
 cust_pkgng () (
 
 	# If the package directory doesn't exist, we're done.