diff options
| author | Stefan Metzmacher <metze@samba.org> | 2012-09-10 14:52:35 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-09-12 07:07:27 +0200 |
| commit | 2c4255084a036a8d9b029484c6fceedd989cd79b (patch) | |
| tree | d843d83604654fad5d8d1e2feab31b81d6b0eb0f | |
| parent | a0baaf2064f5abbca0b29d5d3cb538e78091e332 (diff) | |
| download | samba-2c4255084a036a8d9b029484c6fceedd989cd79b.tar.gz samba-2c4255084a036a8d9b029484c6fceedd989cd79b.tar.bz2 samba-2c4255084a036a8d9b029484c6fceedd989cd79b.zip | |
s4:scripting: rename upgradeprovision -> samba_upgradeprovision
metze
| -rwxr-xr-x | source4/scripting/bin/samba_upgradeprovision (renamed from source4/scripting/bin/upgradeprovision) | 0 | ||||
| -rw-r--r-- | source4/scripting/bin/wscript_build | 2 | ||||
| -rw-r--r-- | source4/scripting/wscript_build | 2 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_upgradeprovision.sh | 4 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/samba_upgradeprovision index 344d7f56c2..344d7f56c2 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/samba_upgradeprovision diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build index e95fd03fc0..1f1ead91c9 100644 --- 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 ddd553386e..9af23f69b2 100644 --- 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 3df47e70c1..1ff76952e3 100755 --- 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 |