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)

diff --git a/source4/setup/provision b/source4/setup/provision
index 6974afeec9b6160568eb7f56ba57cc34b9ebf6ad..4b2a260cf91e511dfe8c23ba4ca187f973fe6d7b 100755 (executable)
--- 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 251b9663a774831c2f234103b2aeacfd34a0a432..4c1c011b29f5bab681410aae1e9a1fb592b58a45 100755 (executable)
--- 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) {