mirror of
https://github.com/samba-team/samba.git
synced 2025-02-03 13:47:25 +03:00
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 commit is contained in:
parent
ffe9042e15
commit
916607d1d0
@ -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;
|
||||
|
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user