diff options
| author | yetoohappy <yetoohappy@gmail.com> | 2022-11-06 21:36:36 +0000 |
|---|---|---|
| committer | Sergio Carlavilla Delgado <carlavilla@FreeBSD.org> | 2022-11-06 21:36:36 +0000 |
| commit | 313c8a75f1c13995dfa1dee6fe6225c32f564c5a (patch) | |
| tree | f0f5a1f4079caf55589249509a0dec6d1a57b225 | |
| parent | c2df6c5ffb8a41a51279358acc93d1bacb3617d2 (diff) | |
| download | doc-313c8a75f1c13995dfa1dee6fe6225c32f564c5a.tar.gz doc-313c8a75f1c13995dfa1dee6fe6225c32f564c5a.zip | |
Add warning about migrating from mergemaster to etcupdate
PR: 260253
Reviewed by: pauamma@
| -rw-r--r-- | documentation/content/en/books/handbook/cutting-edge/_index.adoc | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc index 7ad3692bc1..8e5bed211b 100644 --- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc +++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc @@ -666,6 +666,22 @@ The build process takes longer to update a system than just installing binary up This is a quick reference for the typical steps used to update FreeBSD by building from source. Later sections describe the process in more detail. +[WARNING] +==== +When switching from man:mergemaster[8] to man:etcupdate[8], the first run might merge changes incorrectly generating spurious onflicts. +To prevent this, perform the following steps *before* updating sources and building the new world: + +[source,shell] +.... +# etcupdate extract <.> +# etcupdate diff <.> +.... + +<.> Bootstrap the database of stock [.filename]#/etc# files; for more information see man:etcupdate[8]. + +<.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates. +==== + [.procedure] ==== * Update and Build @@ -967,7 +983,7 @@ To prevent this, perform the following steps *before* updating sources and build # etcupdate diff <.> .... -<.> Bootstrap the database of stock [.filename]#/etc# files, for more information see man:etcupdate[8]. +<.> Bootstrap the database of stock [.filename]#/etc# files; for more information see man:etcupdate[8]. <.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates. ==== |