diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-25 01:02:13 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-25 01:02:13 +0100 |
| commit | 37f35d2a03409e0d52232d4c4f956ec8637d4884 (patch) | |
| tree | b7e55eeb80312e4d5caabfaf9f507ab3acf65af6 /source4/scripting/python/samba/upgrade.py | |
| parent | 8afcbdcfe71fad0f6a22314de16ac047148d42b8 (diff) | |
| download | samba-37f35d2a03409e0d52232d4c4f956ec8637d4884.tar.gz samba-37f35d2a03409e0d52232d4c4f956ec8637d4884.tar.xz samba-37f35d2a03409e0d52232d4c4f956ec8637d4884.zip | |
python/provision: Reconcile code partitions-only provisioning and generic provisioning, some other minor refactoring of the provisioning.
Pair-programmed by Andrew and me using obby :-)
(This used to be commit 688adcbb635af87fcfedb869b7f1857a947fd2f9)
Diffstat (limited to 'source4/scripting/python/samba/upgrade.py')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index abf1127c36..a118af2526 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -7,7 +7,7 @@ """Support code for upgrading from Samba 3 to Samba 4.""" -from provision import findnss, provision +from provision import findnss, provision, FILL_DRS import grp import ldb import pwd @@ -245,7 +245,8 @@ def upgrade_provision(samba3, setup_dir, message, credentials, session_info, lp, else: machinepass = None - domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, blank=True, ldapbackend=None, + domaindn = provision(lp=lp, setup_dir=setup_dir, message=message, + samdb_fill=FILL_DRS, ldapbackend=None, paths=paths, session_info=session_info, credentials=credentials, realm=realm, domain=domainname, domainsid=domainsid, domainguid=domainguid, machinepass=machinepass, serverrole=serverrole) |