selftest: Do not start up an already-running test environment

[samba.git] / upgrading-samba4.txt

diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt
index b84bbaba033b97811db4f09a42417c630d68d1d1..82f562e22acd8614d5954923ac39a2c9d8921937 100644 (file)
--- a/upgrading-samba4.txt
+++ b/upgrading-samba4.txt
@@ -1,24 +1,20 @@
 Upgrading from an older samba4 installation.
 
-For users of samba4 alpha 8 and after
-=====================================
-
+* 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
+  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'
 
-For users of samba4 alpha 8 and after
-=====================================
-
-* Stop any samba/smbd 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 --full
-* do make install
+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.