Switch to etcupdate(8)

diff --git a/update_stage1.sh b/update_stage1.sh
index d85ecbf126f45ce850f93a6fef06de6cdfd92763..28ed57993d95688c8849ae9053d211bd31d33f07 100755 (executable)
--- a/update_stage1.sh
+++ b/update_stage1.sh
@@ -13,9 +13,9 @@ mountro=`zfs get -H readonly llroot/ROOT/master | cut -w -f 3`
 [ ${mountro} = "on" ] && zfs_mount
 usrsrc=${USRSRC:-/usr/src}
 
-mergemaster -p && \
+etcupdate -p && \
 make -C ${usrsrc} installworld && \
-mergemaster -iF && \
+etcupdate && \
 make -C ${usrsrc} delete-old && \
 echo "reboot to delete old libs"
 # make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old