View | Details | Raw Unified | Return to bug 219405
Collapse All | Expand All

(-)defaults.sh (-9 / +18 lines)
Lines 951-957 Link Here
951
		echo "FAILED: need a pkg/ package for bootstrapping"
951
		echo "FAILED: need a pkg/ package for bootstrapping"
952
		exit 2
952
		exit 2
953
	fi
953
	fi
954
	NANO_PACKAGE_LIST="${_NANO_PKG_PACKAGE} ${NANO_PACKAGE_LIST}"
955
954
956
	# Mount packages into chroot
955
	# Mount packages into chroot
957
	mkdir -p ${NANO_WORLDDIR}/_.p
956
	mkdir -p ${NANO_WORLDDIR}/_.p
Lines 959-973 Link Here
959
958
960
	trap "umount ${NANO_WORLDDIR}/_.p ; rm -rf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT
959
	trap "umount ${NANO_WORLDDIR}/_.p ; rm -rf ${NANO_WORLDDIR}/_.p" 1 2 15 EXIT
961
960
962
	# Install packages
961
	# Install pkg-* package
963
	todo="$(echo "${NANO_PACKAGE_LIST}" | awk '{ print NF }')"
962
	CR "${PKGCMD} add /_.p/${_NANO_PKG_PACKAGE}"
964
	echo "=== TODO: $todo"
965
	echo "${NANO_PACKAGE_LIST}"
966
	echo "==="
967
	for _PKG in ${NANO_PACKAGE_LIST}; do
968
		CR "${PKGCMD} add /_.p/${_PKG}"
969
	done
970
963
964
	(
965
		cd "${NANO_PACKAGE_DIR}"
966
		_PKGS=`find ${NANO_PACKAGE_LIST} -not -name "${_NANO_PKG_PACKAGE}" -print | sort | uniq`
967
968
		# Show todo
969
		todo=`echo "$_PKGS" | wc -l`
970
		echo "=== TODO: $todo"
971
		echo "$_PKGS"
972
		echo "==="
973
974
		# Install packages
975
		for _PKG in $_PKGS; do
976
			CR "${PKGCMD} add /_.p/${_PKG}"
977
		done
978
	)
979
971
	CR0 "${PKGCMD} info"
980
	CR0 "${PKGCMD} info"
972
981
973
	trap - 1 2 15 EXIT
982
	trap - 1 2 15 EXIT

Return to bug 219405