X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/a57065a884cd914933230ce9372594cedfc32e4e..c541a65d003479235fec01b577d04ce10dc6800d:/UPDATING

diff --git a/UPDATING b/UPDATING
index 98a4b99453..34b9cfc52f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -8,38 +8,15 @@
 # If you discover any problem, please contact the bugs@lists.dragonflybsd.org
 # mailing list with the details.
 #
-# $DragonFly: src/UPDATING,v 1.25 2008/03/03 20:24:51 swildner Exp $
+# $DragonFly: src/UPDATING,v 1.26 2008/09/15 20:03:36 thomas Exp $
 
 +-----------------------------------------------------------------------+
 +         UPGRADING DRAGONFLY ON AN EXISTING DRAGONFLY SYSTEM		+
 +				GENERAL					+
 +-----------------------------------------------------------------------+
 
-The best way to upgrade DragonFly is to maintain a copy of the DragonFly
-CVS repository via cvsup and to checkout the source base via this repository.
-The repository is stored in /home/dcvs by default and requires about 800MB
-of disk space.  The checked out source tree (/usr/src) requires about 400MB
-of disk space, and the build will eat around 800MB of space out of /usr/obj.
-To maintain the build you should reserve at least 2.5GB of disk space, and
-3.5GB if you have the space.
-
-Note: most people run cvsup via a root cron job to keep the repository up to
-date.  Please limit such automatic updates to once a day and try to randomize
-the hour and minute in the cron job a bit to avoid pileups.
-
-	# get the CVS repository (it is placed in /home/dcvs)
-	cvsup /usr/share/examples/cvsup/DragonFly-cvs-supfile
-	# install the source from the CVS hierarchy
-	cd /usr
-	cvs -R -d /home/dcvs checkout -P src
-
-Once you have the repository and broken out sources you can decide whether to
-update your sources from the repository automatically or manually.  Since
-you are tracking changes made to DragonFly, it is usually a good idea to
-update the sources manually:
-
-	cd /usr/src
-	cvs update -dP
+Instructions on how to obtain and maintain DragonFly source code using git
+are in the development(7) manual page.
 
 To upgrade a DragonFly system from sources you run the following sequence:
 
@@ -55,12 +32,38 @@ older DragonFly installations and should delete them automatically.
 
 	make upgrade
 
+See the build(7) manual page for further information.
+
 Once you've done a full build of the world and kernel you can do incremental
 upgrades of either by using the 'quickworld' and 'quickkernel' targets
 instead of 'buildworld' and 'buildkernel'.  If you have any problems with
-the quick targets, try doing a cvsup, cvs update, and then a full buildworld
+the quick targets, try updating your repo first, and then a full buildworld
 and buildkernel as shown above, before asking for help.
 
++-----------------------------------------------------------------------+
++         UPGRADING FROM DRAGONFLY <= 2.0 TO DRAGONFLY >= 2.1		+
++-----------------------------------------------------------------------+
+
+In 2.1 kernel and modules has moved to boot directory.  For most cases
+this is handled automatically by 'make upgrade'.  A few cases needs manual
+intervention:
+
+ * When installing a kernel without first doing a make buildworld,
+   installworld and upgrade to the same DESTDIR as kernel:
+   make DESTDIR/boot directory and move kernel and modules into this boot
+   directory; also move kernel.old and modules.old.
+   Typical example is vkernel(7), use (no modules used):
+
+	cd /var/vkernel
+	mkdir boot
+	chflags noschg kernel
+	mv kernel kernel.old boot
+	chflags schg boot/kernel
+	
+ * When using a boot-only partition, /boot/loader.rc needs to be edited:
+   delete occurrences of '/boot/'.
+   These occurences can normally be deleted in any case, see loader(8).
+
 +-----------------------------------------------------------------------+
 +         UPGRADING FROM DRAGONFLY <= 1.8 TO DRAGONFLY >= 1.9		+
 +-----------------------------------------------------------------------+