svn commit: samba r12944 - in branches/SAMBA_4_0/source/setup: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-01-15 07:02:34 +0000 (Sun, 15 Jan 2006)
New Revision: 12944

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12944

Log:
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

Modified:
   branches/SAMBA_4_0/source/setup/provision
   branches/SAMBA_4_0/source/setup/upgrade


Changeset:
Modified: branches/SAMBA_4_0/source/setup/provision
===================================================================
--- branches/SAMBA_4_0/source/setup/provision	2006-01-15 06:59:56 UTC (rev 12943)
+++ branches/SAMBA_4_0/source/setup/provision	2006-01-15 07:02:34 UTC (rev 12944)
@@ -115,9 +115,10 @@
 
 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;

Modified: branches/SAMBA_4_0/source/setup/upgrade
===================================================================
--- branches/SAMBA_4_0/source/setup/upgrade	2006-01-15 06:59:56 UTC (rev 12943)
+++ branches/SAMBA_4_0/source/setup/upgrade	2006-01-15 07:02:34 UTC (rev 12944)
@@ -10,6 +10,7 @@
 		"POPT_AUTOHELP",
 		"POPT_COMMON_SAMBA",
 		"POPT_COMMON_VERSION",
+		"POPT_COMMON_CREDENTIALS",
 		'verify',
 		'targetdir=s',
 		'quiet', 'blank');
@@ -85,7 +86,11 @@
 	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) {