s4:upgrade_from_s3 - Move it back to "setup"
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Sat, 28 Nov 2009 18:23:08 +0000 (19:23 +0100)
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>
Sat, 28 Nov 2009 18:25:12 +0000 (19:25 +0100)
Suggested by Jelmer

WHATSNEW4.txt
howto4.txt
source4/selftest/tests.sh
source4/setup/upgrade_from_s3 [moved from source4/scripting/bin/upgrade_from_s3 with 100% similarity]

index 9718bf45a408a4adbfbec181f989133b7fc620b9..1c9d1e43cdcd7268d47425d9fc7f2121b3cef6fa 100644 (file)
@@ -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!
index 50acf2306bc9f882870b83be310c35561cad38ce..e33d0403249b3cb70d4ff56884cc0f448312c23a 100644 (file)
@@ -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
index 7c9b19f8f6b9670fe23fa9544630f2b124a7a21d..73209efefeca9a07929fdd526cd31b6e5dc8014f 100755 (executable)
@@ -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"