Patch to reflect proper build sequence.

[Matthew Dillon]

    I'm not sure this works in all situations.  It should be reasonably
    safe doing an installworld without a reboot as long as you are not
    doing anything else and reboot after the installworld completes.  In
    fact, I would expect that to work most of the time so I'd rather not
    have people go through an extra 60 second step by default.

					-Matt
					Matthew Dillon 
					<dillon at xxxxxxxxxxxxx>


:
:
:--a8Wt8u1KmwUX3Y2C
:Content-Type: text/plain; charset=us-ascii
:Content-Disposition: inline
:
:Since it was mentioned by RaD|Tz on IRC that 
:rebooting between installkernel and installworld was
:not mentioned in /usr/SRC/Updating, here's a patch.
:Also changes mention of mergemaster to match our current
:procedure of make upgrade.
:--a8Wt8u1KmwUX3Y2C
:Content-Type: text/plain; charset=us-ascii
:Content-Disposition: attachment; filename=patch
:
:Index: Makefile
:===================================================================
:RCS file: /home/ncvs/src/Makefile,v
:retrieving revision 1.9
:diff -u -r1.9 Makefile
:--- Makefile	12 Nov 2004 09:09:56 -0000	1.9
:+++ Makefile	21 Feb 2005 19:03:21 -0000
:@@ -58,10 +58,9 @@
: # 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).
:-# 6.  `mergemaster -p'
:-# 7.  `make installworld'
:-# 8.  `mergemaster'
:-# 9.  `reboot'
:+# 6.  `make installworld'
:+# 7.  `make upgrade'
:+# 8.  `reboot'
: #
: # See src/UPDATING `COMMON ITEMS' for more complete information.
: #
:Index: UPDATING
:===================================================================
:RCS file: /home/ncvs/src/UPDATING,v
:retrieving revision 1.10
:diff -u -r1.10 UPDATING
:--- UPDATING	23 Nov 2004 02:20:40 -0000	1.10
:+++ UPDATING	21 Feb 2005 19:02:41 -0000
:@@ -1,4 +1,4 @@
:-$DragonFly$
:+$DragonFly: src/UPDATING,v 1.10 2004/11/23 02:20:40 hmp Exp $
: 
: Updating Information for DragonFly users.
: 
:@@ -119,8 +119,14 @@
: 	make buildworld
: 	make buildkernel KERNCONF=<KERNELNAME>
: 	make installkernel KERNCONF=<KERNELNAME>
:+	reboot into single user mode (required if abi has changed)
: 	make installworld
: 
:+Note: please pay attention to the reboot. If the kernel interface has
:+changed (e.g. new syscalls were added) you must reboot before installworld
:+or your world will begin using calls that your currently running kernel
:+can't provide.
:+
: You will also want to run the 'upgrade' target to upgrade your /etc.  The
: upgrade target is aware of stale files created by older DragonFly 
: installations and should delete them automatically.
:Index: share/man/man7/build.7
:===================================================================
:RCS file: /home/ncvs/src/share/man/man7/build.7,v
:retrieving revision 1.4
:diff -u -r1.4 build.7
:--- share/man/man7/build.7	8 Jul 2004 00:14:49 -0000	1.4
:+++ share/man/man7/build.7	21 Feb 2005 19:06:41 -0000
:@@ -152,10 +152,15 @@
: make buildworld
: make buildkernel KERNCONF=FOO
: make installkernel KERNCONF=FOO
:+(reboot into single user mode)
: make installworld
:-mergemaster
:+make upgrade
: .Ed
: .Pp
:+Note: the reboot above must be followed if there have been changes to
:+the kernel ABI, (e.g. new syscalls have been added) otherwise things
:+will break.
:+.Pp
: .Dq FOO
: must be replaced with the name of the kernel configuration file from which
: the kernel should be built.
:
:--a8Wt8u1KmwUX3Y2C--