From d59667fd2192920c8dd33cde8ff25fd5af0e00c3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 15 Jan 2006 07:02:34 +0000 Subject: 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) --- source4/setup/provision | 5 +++-- source4/setup/upgrade | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'source4/setup') 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) { -- cgit