diff options
| author | Dries Michiels <driesm@FreeBSD.org> | 2022-10-04 19:34:05 +0000 |
|---|---|---|
| committer | Dries Michiels <driesm@FreeBSD.org> | 2022-10-06 18:19:16 +0000 |
| commit | e6d47601a34ee5e07edb11dac774ace2c9ae66a2 (patch) | |
| tree | 566ad47269ade296851811826b263f9e024ef417 /Makefile | |
| parent | 7466f157f39d04d3ddf21f232e0d8c82134e9605 (diff) | |
| download | src-e6d47601a34ee5e07edb11dac774ace2c9ae66a2.tar.gz src-e6d47601a34ee5e07edb11dac774ace2c9ae66a2.zip | |
Makefile: replace mergemaster references with etcupdate
Similar to UPDATING and handbook changes, treat Makefile the same.
PR: 260822
Approved by: jhb, philip
Differential Revision: https://reviews.freebsd.org/D36877
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -84,9 +84,9 @@ # 4. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). # [steps 3. & 4. can be combined by using the "kernel" target] # 5. `reboot' (in single user mode: boot -s from the loader prompt). -# 6. `mergemaster -p' +# 6. `etcupdate -p' # 7. `make installworld' -# 8. `mergemaster' (you may wish to use -i, along with -U or -F). +# 8. `etcupdate -B' # 9. `make delete-old' # 10. `reboot' # 11. `make delete-old-libs' (in case no 3rd party program uses them anymore) |