summaryrefslogtreecommitdiff
path: root/UPDATING
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2002-10-26 06:25:11 +0000
committerWarner Losh <imp@FreeBSD.org>2002-10-26 06:25:11 +0000
commit63cb445e514ab9149e6ee07329f1917474458cec (patch)
tree50e7b74669b4d7a577d443cad7b1b34a16c67111 /UPDATING
parentfc8c157fad0c1e9bd51c96e879148bda7d3bdd53 (diff)
downloadsrc-test-63cb445e514ab9149e6ee07329f1917474458cec.tar.gz
src-test-63cb445e514ab9149e6ee07329f1917474458cec.zip
A simple make world is too dangerous for most upgrades. Instead, copy
the updating from stable section, and remove the kludge-o-rounds that are in there. Sometimes make world is safe, sometimes not. Let's document the safe way to deal.
Notes
Notes: svn path=/head/; revision=105979
Diffstat (limited to 'UPDATING')
-rw-r--r--UPDATING16
1 files changed, 14 insertions, 2 deletions
diff --git a/UPDATING b/UPDATING
index b5e6a31a9fe5a..204cc7ce899bc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -1001,8 +1001,20 @@ COMMON ITEMS:
To rebuild everything and install it on the current system.
-----------------------------------------------------------
- make world
- Build a new kernel, see above.
+ # Note: sometimes if you are running current you gotta do more than
+ # is listed here if you are upgrading from a really old current.
+
+ <maybe fix /etc/fstab> [7]
+ make buildworld
+ make buildkernel KERNCONF=YOUR_KERNEL_HERE
+ make installkernel KERNCONF=YOUR_KERNEL_HERE
+ [1]
+ <reboot in single user> [3]
+ mergemaster -p [5]
+ make installworld
+ mergemaster [4]
+ <reboot>
+
To upgrade from 4.x-stable to current
-------------------------------------