diff options
| -rw-r--r-- | source4/VERSION | 2 | ||||
| -rwxr-xr-x | source4/script/mkrelease.sh | 3 | ||||
| -rw-r--r-- | upgrading-samba4.txt | 20 |
3 files changed, 7 insertions, 18 deletions
diff --git a/source4/VERSION b/source4/VERSION index 92a4f00ce3..99fc68f620 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE= # e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # # -> "4.0.0alpha1" # ######################################################## -SAMBA_VERSION_ALPHA_RELEASE=9 +SAMBA_VERSION_ALPHA_RELEASE=10 ######################################################## # For 'pre' releases the version will be # diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh index 69ddaa213e..303dfe6d95 100755 --- a/source4/script/mkrelease.sh +++ b/source4/script/mkrelease.sh @@ -11,9 +11,6 @@ OUTDIR=`mktemp -d samba-XXXXX` echo SAMBA_VERSION_IS_GIT_SNAPSHOT=no >> $OUTDIR/source4/VERSION -rm -f $OUTDIR/source4/ldap_server/devdocs/rfc????.txt \ - $OUTDIR/source4/heimdal/lib/wind/rfc????.txt - #Prepare the tarball for a Samba4 release, with some generated files, #but without Samba3 stuff (to avoid confusion) ( cd $OUTDIR/ || exit 1 diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt index b84bbaba03..85e4699063 100644 --- a/upgrading-samba4.txt +++ b/upgrading-samba4.txt @@ -1,24 +1,16 @@ Upgrading from an older samba4 installation. -For users of samba4 alpha 8 and after -===================================== - * 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 +* run ./scripting/bin/upgradeprovision -s <path to smb.conf in samba4 install> * do make install -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 the minimum (safest) upgrade of the data. +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. |