s4:scripting: rename upgradeprovision -> samba_upgradeprovision

metze

diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/samba_upgradeprovision
similarity index 100%
rename from source4/scripting/bin/upgradeprovision
rename to source4/scripting/bin/samba_upgradeprovision

diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index e95fd03fc040c4359824fe770422b19b8e95a4b2..1f1ead91c9c8eecb0ac0b316aecbe48257d39199 100644 (file)
--- a/source4/scripting/bin/wscript_build
+++ b/source4/scripting/bin/wscript_build
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-    for script in ['samba-tool', 'samba_dnsupdate', 'samba_spnupdate', 'samba_kcc', 'upgradeprovision', 'samba_upgradedns']:
+    for script in ['samba-tool', 'samba_dnsupdate', 'samba_spnupdate', 'samba_kcc', 'samba_upgradeprovision', 'samba_upgradedns']:
         bld.SAMBA_SCRIPT(script, pattern=script, installdir='.')

diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index ddd553386e2db6b8fe8098e4553bf2def263be27..9af23f69b2bbb8605664925838bacde805b97487 100644 (file)
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -4,7 +4,7 @@ from samba_utils import MODE_755
 
 sbin_files = None
 if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-    sbin_files = 'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc'
+    sbin_files = 'bin/samba_upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns bin/samba_kcc'
 
 if sbin_files:
     bld.INSTALL_FILES('${SBINDIR}',

diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh
index 3df47e70c190dd629516d40b36a1244f24798b07..1ff76952e36651b79dd14562ad97a96f78aa7c33 100755 (executable)
--- a/source4/setup/tests/blackbox_upgradeprovision.sh
+++ b/source4/setup/tests/blackbox_upgradeprovision.sh
@@ -19,7 +19,7 @@ upgradeprovision() {
     rm -fr $PREFIX/upgradeprovision
   fi
        $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" --use-ntvfs
-       $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
+       $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
 }
 
 upgradeprovision_full() {
@@ -27,7 +27,7 @@ upgradeprovision_full() {
     rm -fr $PREFIX/upgradeprovision_full
   fi
        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" --use-ntvfs
-       $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
+       $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
 }
 
 if [ -d $PREFIX/upgradeprovision ]; then