summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--WHATSNEW4.txt2
-rw-r--r--howto4.txt2
-rwxr-xr-xsource4/selftest/tests.sh2
-rwxr-xr-xsource4/setup/upgrade_from_s3 (renamed from source4/scripting/bin/upgrade_from_s3)0
4 files changed, 3 insertions, 3 deletions
diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index 9718bf45a4..1c9d1e43cd 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -116,7 +116,7 @@ KNOWN ISSUES
- Users upgrading existing databases to Samba4 should carefully
consult upgrading-samba4.txt. We have made a number of changes in
this release that should make it easier to upgrade in future.
- Btw: there exists also a script under the "scripting/bin" directory of the
+ Btw: there exists also a script under the "setup" directory of the
source distribution called "upgrade_from_s3" which should allow a step-up
from Samba3 to Samba4. It's not included yet in the binary distributions
since it's completely experimental!
diff --git a/howto4.txt b/howto4.txt
index 50acf2306b..e33d040324 100644
--- a/howto4.txt
+++ b/howto4.txt
@@ -93,7 +93,7 @@ use the procedures shown in "upgrading-samba4.txt" to upgrade it and keep all
data.
When you are using Samba3 at the moment you could try the experimental script
-"upgrade_from_s3" under the "scripting/bin" directory of the source
+"upgrade_from_s3" under the "setup" directory of the source
distribution (it isn't included in binary distributions yet).
Step 5: Create a simple smb.conf
diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 7c9b19f8f6..73209efefe 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -465,7 +465,7 @@ plantest "ldap.secdesc.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python"
plantest "ldap.acl.python" dc PYTHONPATH="$PYTHONPATH:../lib/subunit/python" $PYTHON $samba4srcdir/lib/ldb/tests/python/acl.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN
plantest "blackbox.samba3dump" none $PYTHON $samba4srcdir/scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade
-plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/scripting/bin/upgrade_from_s3 $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf
+plantest "blackbox.upgrade" none $PYTHON $samba4srcdir/setup/upgrade_from_s3 $CONFIGURATION --targetdir=$PREFIX/upgrade $samba4srcdir/../testdata/samba3 ../testdata/samba3/smb.conf
rm -rf $PREFIX/provision
mkdir $PREFIX/provision
plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision"
diff --git a/source4/scripting/bin/upgrade_from_s3 b/source4/setup/upgrade_from_s3
index 7e1e1fd6eb..7e1e1fd6eb 100755
--- a/source4/scripting/bin/upgrade_from_s3
+++ b/source4/setup/upgrade_from_s3