mountro=`zfs get -H readonly llroot/ROOT/master | cut -w -f 3`
[ ${mountro} = "on" ] && zfs_mount
-mergemaster -p
-cd /usr/src && \
-make installworld && \
-mergemaster -iF && \
-make delete-old && \
+usrsrc=${USRSRC:-/usr/src}
+
+etcupdate -p && \
+make -C ${usrsrc} installworld && \
+etcupdate && \
+make -C ${usrsrc} delete-old && \
echo "reboot to delete old libs"
+# make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old
+# make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old-libs