diff options
| author | Stefan Metzmacher <metze@samba.org> | 2010-09-10 06:36:02 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2010-09-10 17:21:31 +0200 |
| commit | 0ad2890c4e5a0249d45440f66b0ceae33c832328 (patch) | |
| tree | 17943939103a75a3d158296e849fef51e9e79ef9 | |
| parent | bf7ca3f5e7e6f126fd8baec5548dfd45bc5e168f (diff) | |
| download | samba-0ad2890c4e5a0249d45440f66b0ceae33c832328.tar.gz samba-0ad2890c4e5a0249d45440f66b0ceae33c832328.tar.bz2 samba-0ad2890c4e5a0249d45440f66b0ceae33c832328.zip | |
s4:provision: remember the setup directory if it wasn't the default
This fixes make test without a make install.
metze
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 8 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf.dc | 1 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf.member | 1 | ||||
| -rw-r--r-- | source4/setup/provision.smb.conf.standalone | 1 |
4 files changed, 11 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 59787dadc3..ef5852090f 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -569,6 +569,13 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, else: sid_generator_line = "sid generator = " + sid_generator + used_setup_dir = setup_path("") + default_setup_dir = default_lp.get("setup directory") + setupdir_line = "" + if used_setup_dir != default_setup_dir: + setupdir_line = "setup directory = %s" % used_setup_dir + default_lp.set("setup directory", used_setup_dir) + sysvol = os.path.join(default_lp.get("lock dir"), "sysvol") netlogon = os.path.join(sysvol, realm.lower(), "scripts") @@ -580,6 +587,7 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole, "SERVERROLE": serverrole, "NETLOGONPATH": netlogon, "SYSVOLPATH": sysvol, + "SETUPDIRECTORY_LINE": setupdir_line, "SIDGENERATOR_LINE": sid_generator_line, "PRIVATEDIR_LINE": privatedir_line, "LOCKDIR_LINE": lockdir_line, diff --git a/source4/setup/provision.smb.conf.dc b/source4/setup/provision.smb.conf.dc index 0449f75ffe..e720900eb4 100644 --- a/source4/setup/provision.smb.conf.dc +++ b/source4/setup/provision.smb.conf.dc @@ -3,6 +3,7 @@ workgroup = ${DOMAIN} realm = ${REALM} server role = ${SERVERROLE} + ${SETUPDIRECTORY_LINE} ${SIDGENERATOR_LINE} ${PRIVATEDIR_LINE} ${LOCKDIR_LINE} diff --git a/source4/setup/provision.smb.conf.member b/source4/setup/provision.smb.conf.member index 4d32ef478c..9fe8995723 100644 --- a/source4/setup/provision.smb.conf.member +++ b/source4/setup/provision.smb.conf.member @@ -3,6 +3,7 @@ workgroup = ${DOMAIN} realm = ${REALM} server role = ${SERVERROLE} + ${SETUPDIRECTORY_LINE} ${SIDGENERATOR_LINE} ${PRIVATEDIR_LINE} ${LOCKDIR_LINE} diff --git a/source4/setup/provision.smb.conf.standalone b/source4/setup/provision.smb.conf.standalone index 4d32ef478c..9fe8995723 100644 --- a/source4/setup/provision.smb.conf.standalone +++ b/source4/setup/provision.smb.conf.standalone @@ -3,6 +3,7 @@ workgroup = ${DOMAIN} realm = ${REALM} server role = ${SERVERROLE} + ${SETUPDIRECTORY_LINE} ${SIDGENERATOR_LINE} ${PRIVATEDIR_LINE} ${LOCKDIR_LINE} |