sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r12944: Update scripts in setup to match changes in the provision.js

Browse Source 
DNS is now done as a seperate step, to assist in migrations.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2006-01-15 07:02:34 +00:00 committed by Gerald (Jerry) Carter
parent ffe9042e15
commit 916607d1d0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/setup/provision
View File

@ -115,9 +115,10 @@ if (!provision_validate(subobj, message)) {
var creds = options.get_credentials(); var creds = options.get_credentials();
var system_session = system_session(); var system_session = system_session();
var paths = provision_default_paths(subobj);
message("Provisioning for %s in realm %s\n", subobj.DOMAIN, subobj.REALM); message("Provisioning for %s in realm %s\n", subobj.DOMAIN, subobj.REALM);
message("Using administrator password: %s\n", subobj.ADMINPASS); 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"); message("All OK\n");
return 0; return 0;

7
source/setup/upgrade
View File

@ -10,6 +10,7 @@ options = GetOptions(ARGV,
"POPT_AUTOHELP", "POPT_AUTOHELP",
"POPT_COMMON_SAMBA", "POPT_COMMON_SAMBA",
"POPT_COMMON_VERSION", "POPT_COMMON_VERSION",
"POPT_COMMON_CREDENTIALS",
'verify', 'verify',
'targetdir=s', 'targetdir=s',
'quiet', 'blank'); 'quiet', 'blank');
@ -85,7 +86,11 @@ if (options.targetdir != undefined) {
paths = provision_default_paths(subobj);; 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); var ret = upgrade(subobj,samba3,message,paths);
if (ret > 0) { if (ret > 0) {