D41797.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D41797.diff
View Options

	diff --git a/release/Makefile b/release/Makefile
	--- a/release/Makefile
	+++ b/release/Makefile
	@@ -118,13 +118,7 @@
	base.txz:
	mkdir -p ${DISTDIR}
	cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR}
	-# TODO: Add NO_ROOT mode to mm-tree.sh
	-.if !defined(NO_ROOT)
	-# Set up mergemaster root database
	- sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
	- "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \
	- -D "${.OBJDIR}/${DISTDIR}/base"
	-.endif
	+ # Bootstrap etcupdate(8) database.
	sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \
	-m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
	-s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \
	diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
	--- a/release/tools/vmimage.subr
	+++ b/release/tools/vmimage.subr
	@@ -56,14 +56,11 @@
	installworld installkernel distribution \|\| \
	err "\n\nCannot install the base system to ${DESTDIR}."

	- # Bootstrap etcupdate(8) and mergemaster(8) databases.
	+ # Bootstrap etcupdate(8) database.
	mkdir -p ${DESTDIR}/var/db/etcupdate
	etcupdate extract -B \
	-M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
	-s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate
	- sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \
	- -F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
	- -D ${DESTDIR}

	echo '# Custom /etc/fstab for FreeBSD VM images' \
	> ${DESTDIR}/etc/fstab