Hi!

The upgrade instructions found in src/UPDATING and src/Makefile.inc1
are not quite correct.  Suggesting to reboot with the new kernel and
non-matching userland is safer than opposite of course, but does not
always work nor guaranteed to work at all.  Here's the safest version
I could think of; it ensures everything is installed using the tools
compatible with the currently running kernel.  I'd like your comments
guys as you were touching these instructions in the past.

%%%
Index: UPDATING
===================================================================
RCS file: /home/ncvs/src/UPDATING,v
retrieving revision 1.208
diff -u -r1.208 UPDATING
--- UPDATING    20 May 2002 13:06:24 -0000      1.208
+++ UPDATING    22 May 2002 15:45:49 -0000
@@ -958,10 +958,10 @@
        make buildkernel KERNCONF=YOUR_KERNEL_HERE
        cp src/sys/${MACHINE_ARCH}/conf/GENERIC.hints /boot/device.hints [2]
        make installkernel KERNCONF=YOUR_KERNEL_HERE
-       reboot in single user [3]
+       shutdown in single user [3]
        mergemaster -p          [5]
-       make installworld
        mergemaster             [4]
+       make installworld
        [1]
        <reboot>
 
@@ -985,14 +985,17 @@
        your own device.hints to reflect your unique hardware
        configuration.
 
-       [3] From the bootblocks, boot -s, and then do
+       [3] Do not reboot with the new kernel as your installed
+       binaries may be incompatible with it.  Instead, shutdown
+       or reboot with the old kernel in single user mode.  If
+       rebooted, from the bootblocks, boot -s, and then do
                fsck -p
                mount -u /
                mount -a
                cd /usr/src
                adjkerntz -i            # if CMOS is wall time
        Also, when doing a major release upgrade, it is required that
-       you boot into single user mode to do the installworld.
+       you operate in single user mode to do the installworld.
 
        [4] Note: This step is non-optional.  Failure to do this step
        can result in a significant reduction in the functionality of the
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/Makefile,v
retrieving revision 1.256
diff -u -r1.256 Makefile
--- Makefile    12 May 2002 16:00:43 -0000      1.256
+++ Makefile    22 May 2002 15:45:49 -0000
@@ -48,10 +48,10 @@
 # 2.  `make buildworld'
 # 3.  `make buildkernel KERNCONF=YOUR_KERNEL_HERE'     (default is GENERIC).
 # 4.  `make installkernel KERNCONF=YOUR_KERNEL_HERE'   (default is GENERIC).
-# 5.  `reboot'        (in single user mode: boot -s from the loader prompt).
+# 5.  `shutdown' or `reboot' into single user mode with the old kernel.
 # 6.  `mergemaster -p'
-# 7.  `make installworld'
-# 8.  `mergemaster'
+# 7.  `mergemaster'
+# 8.  `make installworld'
 # 9.  `reboot'
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
%%%


Cheers,
-- 
Ruslan Ermilov          Sysadmin and DBA,
[EMAIL PROTECTED]           Sunbay Software AG,
[EMAIL PROTECTED]          FreeBSD committer,
+380.652.512.251        Simferopol, Ukraine

http://www.FreeBSD.org  The Power To Serve
http://www.oracle.com   Enabling The Information Age

Attachment: msg38687/pgp00000.pgp
Description: PGP signature

Reply via email to