X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=upgrading-samba4.txt;h=8c74f5aae5840b34526214ef4d1b5306fc3a52c6;hb=8bcaa145f23e606f4b850fe7147192a6fec11c2d;hp=85e46990634ed071edcf1ae5a3b60e56f3dd12e8;hpb=5c2db53358ac4769833c2b14c69a8a6e9f91d649;p=obnox%2Fsamba%2Fsamba-obnox.git

diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt
index 85e46990634..8c74f5aae58 100644
--- a/upgrading-samba4.txt
+++ b/upgrading-samba4.txt
@@ -1,16 +1,28 @@
 Upgrading from an older samba4 installation.
 
+* Compile the new version of samba4 by following the HOWTO, but do
+  not install it yet, and do not run provision.
 * Stop any samba process
 * Backup your samba4 provision:
-  go in the directory where your samba4 provision is stored (/usr/local/samba by default)
-  do tar cf $HOME/backup.tar private (it's also recommended to save the etc/smb.conf and var/sysvol dir aswell)
-* Go in the source4 dir
-* run ./scripting/bin/upgradeprovision -s <path to smb.conf in samba4 install>
+  go into the directory where your samba4 provision is stored (/usr/local/samba by default)
+  do tar cf $HOME/backup.tar private etc var sysvol
 * do make install
+* run 'samba-tool dbcheck'
 
-This will do the minimum (safest) upgrade of the data.  
+This will do a consistency check of the data, and is all most existing
+installations will require.
+
+If you are upgrading from a quite old provision (Samba 4.0 alpha 13 or
+earlier) then running upgradeprovision will do an upgrade of security
+descriptors, and upgradeprovision --full will perform a more
+comprehensive upgrade of the data (including schema and display
+specifiers).  This attempts to do a new provision, and to then copy
+existing data into that database.
+
+If you are upgrading from a more recent version, particularly alpha16
+or later, then it is better *NOT* to run upgradeprovision as the
+database format has not changed.
+
+To upgrade from BIND9 flat files to the internal database store for
+Bind 9 DLZ, use ./source4/scripting/bin/samba_upgradedns
 
-Runing upgradeprovision with --full will do a more comprehensive
-upgrade of the data (including schema and display specifiers).  This
-attempts to do a new provision, and to then copy existing data into
-that database.