From: David Marec <DavidMarec@users.noreply.github.com>
Date: Fri, 1 Jan 2021 09:32:18 +0000 (+0100)
Subject: Switch to etcupdate(8)
X-Git-Url: http://popeye.lapinbilly.eu/git/?p=fbsd-stable-mgmt.git;a=commitdiff_plain;h=3803cdba2ae2b4fa2bf7462e477e10b2216cc016

Switch to etcupdate(8)
---

diff --git a/update_stage1.sh b/update_stage1.sh
index d85ecbf..28ed579 100755
--- 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