Index: tools/build/beinstall.sh
===================================================================
--- tools/build/beinstall.sh	(revision 336739)
+++ tools/build/beinstall.sh	(working copy)
@@ -82,11 +82,24 @@
 	beadm destroy -F ${BENAME}
 }
 
+update_mergemaster_pre() {
+echo "======== mergemaster -p -m $(pwd) -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}"
+	mergemaster -p -m $(pwd) -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
+}
+
 update_mergemaster() {
+echo "======== mergemaster -m $(pwd) -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}"
 	mergemaster -m $(pwd) -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
 }
 
+update_etcupdate_pre() {
+echo "======== etcupdate -p -s $(pwd) -D ${BE_MNTPT} ${ETCUPDATE_FLAGS}"
+	etcupdate -p -s $(pwd) -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
+	etcupdate resolve -D ${BE_MNTPT}
+}
+
 update_etcupdate() {
+echo "======== etcupdate -s $(pwd) -D ${BE_MNTPT} ${ETCUPDATE_FLAGS}"
 	etcupdate -s $(pwd) -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
 	etcupdate resolve -D ${BE_MNTPT}
 }
@@ -138,11 +151,15 @@
 
 echo "Mounted ${BENAME} to ${BE_MNTPT}, performing install/update ..."
 make $* DESTDIR=${BE_MNTPT} installkernel || errx "Installkernel failed!"
-make $* DESTDIR=${BE_MNTPT} installworld || errx "Installworld failed!"
+if [ -n "${CONFIG_UPDATER}" ]; then
+	"update_${CONFIG_UPDATER}_pre"
+	[ $? -ne 0 ] && errx "${CONFIG_UPDATER} (pre-world) failed!"
+fi
 
+make $* -DDB_FROM_SRC DESTDIR=${BE_MNTPT} installworld || errx "Installworld failed!"
 if [ -n "${CONFIG_UPDATER}" ]; then
 	"update_${CONFIG_UPDATER}"
-	[ $? -ne 0 ] && errx "${CONFIG_UPDATER} failed!"
+	[ $? -ne 0 ] && errx "${CONFIG_UPDATER} (post-world) failed!"
 fi
 
 BE_PKG="chroot ${BE_MNTPT} env ASSUME_ALWAYS_YES=true pkg"