diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-01-15 07:02:34 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:51:11 -0500 |
| commit | d59667fd2192920c8dd33cde8ff25fd5af0e00c3 (patch) | |
| tree | ec328210e1b872386fe31e7806b3687274a77fd3 | |
| parent | c96b5723869eca3155db2e2185354bb95d61c566 (diff) | |
| download | samba-d59667fd2192920c8dd33cde8ff25fd5af0e00c3.tar.gz samba-d59667fd2192920c8dd33cde8ff25fd5af0e00c3.tar.bz2 samba-d59667fd2192920c8dd33cde8ff25fd5af0e00c3.zip | |
r12944: Update scripts in setup to match changes in the provision.js
DNS is now done as a seperate step, to assist in migrations.
Andrew Bartlett
(This used to be commit 916607d1d08b6a41c375766a69fd609989e35bed)
| -rwxr-xr-x | source4/setup/provision | 5 | ||||
| -rwxr-xr-x | source4/setup/upgrade | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index 6974afeec9..4b2a260cf9 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -115,9 +115,10 @@ if (!provision_validate(subobj, message)) { var creds = options.get_credentials(); var system_session = system_session(); - +var paths = provision_default_paths(subobj); message("Provisioning for %s in realm %s\n", subobj.DOMAIN, subobj.REALM); message("Using administrator password: %s\n", subobj.ADMINPASS); -provision(subobj, message, blank, provision_default_paths(subobj), system_session, creds); +provision(subobj, message, blank, paths, system_session, creds); +provision_dns(subobj, message, paths, system_session, creds); message("All OK\n"); return 0; diff --git a/source4/setup/upgrade b/source4/setup/upgrade index 251b9663a7..4c1c011b29 100755 --- a/source4/setup/upgrade +++ b/source4/setup/upgrade @@ -10,6 +10,7 @@ options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA", "POPT_COMMON_VERSION", + "POPT_COMMON_CREDENTIALS", 'verify', 'targetdir=s', 'quiet', 'blank'); @@ -85,7 +86,11 @@ if (options.targetdir != undefined) { paths = provision_default_paths(subobj);; } -provision(subobj, message, options.blank,paths); +var creds = options.get_credentials(); +var system_session = system_session(); +var paths = provision_default_paths(subobj); +provision(subobj, message, options.blank, paths, system_session, creds); +provision_dns(subobj, message, paths, system_session, creds); var ret = upgrade(subobj,samba3,message,paths); if (ret > 0) { |