FreeBSD Bugzilla – Attachment 229943 Details for
Bug 260253
handbook: 24.5.1 missing warning about migrating from mergemaster to etcupdate
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Warn about mergemaster to etcupdate migration
0001-handbook-warn-about-mergemaster-to-etcupdate-in-24.5.patch (text/plain), 2.01 KB, created by
plastickey
on 2021-12-06 20:13:33 UTC
(
hide
)
Description:
Warn about mergemaster to etcupdate migration
Filename:
MIME Type:
Creator:
plastickey
Created:
2021-12-06 20:13:33 UTC
Size:
2.01 KB
patch
obsolete
>From 562ff6cb9fe3e6e557a07fbf04f0eba5354f7009 Mon Sep 17 00:00:00 2001 >From: yetoo <yetoohappy@gmail.com> >Date: Mon, 6 Dec 2021 01:32:06 -0800 >Subject: [PATCH 1/1] handbook: warn about mergemaster to etcupdate in 24.5.1 > >--- > .../en/books/handbook/cutting-edge/_index.adoc | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > >diff --git a/documentation/content/en/books/handbook/cutting-edge/_index.adoc b/documentation/content/en/books/handbook/cutting-edge/_index.adoc >index bbd2cc68f8..442baf6756 100644 >--- a/documentation/content/en/books/handbook/cutting-edge/_index.adoc >+++ b/documentation/content/en/books/handbook/cutting-edge/_index.adoc >@@ -656,6 +656,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 conflicts. >+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 >@@ -957,7 +973,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. > ==== >-- >2.34.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 260253
:
229938
| 229943