From a6cd4f9de3dd59c158bd2c618bb052076618688d Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sat, 11 Aug 2001 02:03:51 +0000 Subject: Note: mergemaster stopped being optional a long time ago. Caution against doing it by hand (but provide pointers to those wanting to do it by hand). --- UPDATING | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'UPDATING') diff --git a/UPDATING b/UPDATING index a602a13b5b87..18e6342df02c 100644 --- a/UPDATING +++ b/UPDATING @@ -702,7 +702,7 @@ COMMON ITEMS: make installkernel KERNCONF=YOUR_KERNEL_HERE reboot in single user [3] make installworld - mergemaster + mergemaster [4] [1] @@ -733,6 +733,13 @@ COMMON ITEMS: cd /usr/src adjkerntz -i # if COMS is wall time + [4] Note: This step is non-optional. Failure to do this step + can result in a significant reduction in the functionality of the + system. Attempting to do it by hand is not recommended and those + that pursue this avenue should read this file carefully, as well + as the archives of freebsd-current and freebsd-hackers mailing lists + for potential gotchas. + FORMAT: This file contains a list, in reverse chronological order, of major -- cgit v1.2.3