View | Details | Raw Unified | Return to bug 260253 | Differences between
and this patch

Collapse All | Expand All

(-)b/documentation/content/en/books/handbook/cutting-edge/_index.adoc (-2 / +17 lines)
Lines 656-661 The build process takes longer to update a system than just installing binary up Link Here
656
This is a quick reference for the typical steps used to update FreeBSD by building from source.
656
This is a quick reference for the typical steps used to update FreeBSD by building from source.
657
Later sections describe the process in more detail.
657
Later sections describe the process in more detail.
658
658
659
[WARNING]
660
====
661
When switching from man:mergemaster[8] to man:etcupdate[8], the first run might merge changes incorrectly generating spurious conflicts.
662
To prevent this, perform the following steps *before* updating sources and building the new world:
663
664
[source,shell]
665
....
666
# etcupdate extract <.>
667
# etcupdate diff <.>
668
....
669
670
<.> Bootstrap the database of stock [.filename]#/etc# files; for more information see man:etcupdate[8].
671
672
<.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates.
673
====
674
659
[.procedure]
675
[.procedure]
660
====
676
====
661
* Update and Build
677
* Update and Build
Lines 957-963 To prevent this, perform the following steps *before* updating sources and build Link Here
957
# etcupdate diff <.>
973
# etcupdate diff <.>
958
....
974
....
959
975
960
<.> Bootstrap the database of stock [.filename]#/etc# files, for more information see man:etcupdate[8].
976
<.> Bootstrap the database of stock [.filename]#/etc# files; for more information see man:etcupdate[8].
961
977
962
<.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates.
978
<.> Check the diff after bootstrapping. Trim any local changes that are no longer needed to reduce the chance of conflicts in future updates.
963
====
979
====
964
- 

Return to bug 260253