Use convenience function for finding setup_dir based on location of

[ira/wip.git] / source4 / setup / upgrade

diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index 03c6747d4e7cdb1c892ef25de5d74579a8fcfb0e..3d1316949f729e11567d33f9eb0b8fcd46b786f1 100755 (executable)
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -1,9 +1,21 @@
 #!/usr/bin/python
 #
-#      Upgrade from Samba3
-#      Copyright Jelmer Vernooij 2005-2007
-#      Released under the GNU GPL v3 or later
+# Upgrade from Samba3
+# Copyright Jelmer Vernooij 2005-2007
 #
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#   
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#   
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 import getopt
 import optparse
 import os, sys
@@ -53,17 +65,19 @@ else:
     smbconf = os.path.join(libdir, "smb.conf")
 samba3 = Samba3(libdir, smbconf)
 
+from samba.provision import find_setup_dir
 from samba.upgrade import upgrade_provision
 
 message("Provisioning\n")
 
 setup_dir = opts.setupdir
 if setup_dir is None:
-       setup_dir = "setup"
+       setup_dir = find_setup_dir()
 
 lp = sambaopts.get_loadparm()
-smbconf = lp.configfile()
+smbconf = lp.configfile
 creds = credopts.get_credentials(lp)
 
-upgrade_provision(samba3, setup_dir, message, credentials=creds, session_info=system_session(), 
-                  smbconf=smbconf, targetdir=opts.targetdir)
+upgrade_provision(samba3, setup_dir, message, credentials=creds, 
+                         session_info=system_session(), smbconf=smbconf, 
+                                 targetdir=opts.targetdir)