summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-11-24 11:00:12 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-11-24 11:04:31 +1100
commit5ea6f7977506b2d8da02b4bcd083cc04f267ee4f (patch)
tree606fbdeab1caf1a738098d1c6c7db76e0538b813 /source4
parent625856f2cf784f5ba39929567796d3225e1c6c3f (diff)
downloadsamba-5ea6f7977506b2d8da02b4bcd083cc04f267ee4f.tar.gz
samba-5ea6f7977506b2d8da02b4bcd083cc04f267ee4f.tar.bz2
samba-5ea6f7977506b2d8da02b4bcd083cc04f267ee4f.zip
s4:provision Don't bother with a template for the LDAP backend startup script.
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provisionbackend.py3
-rw-r--r--source4/setup/ldap_backend_startup.sh2
2 files changed, 1 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 595c1bebbb..04a7a436cf 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -226,8 +226,7 @@ class LDAPBackend(ProvisionBackend):
def start(self):
self.slapd_command_escaped = "\'" + "\' \'".join(self.slapd_command) + "\'"
- setup_file(self.setup_path("ldap_backend_startup.sh"), self.paths.ldapdir + "/ldap_backend_startup.sh", {
- "SLAPD_COMMAND" : self.slapd_command_escaped})
+ open(self.paths.ldapdir + "/ldap_backend_startup.sh", 'w').write("#!/bin/sh\n" + self.slapd_command_escaped + "\n")
# Now start the slapd, so we can provision onto it. We keep the
# subprocess context around, to kill this off at the successful
diff --git a/source4/setup/ldap_backend_startup.sh b/source4/setup/ldap_backend_startup.sh
deleted file mode 100644
index 4a7c765e36..0000000000
--- a/source4/setup/ldap_backend_startup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-${SLAPD_COMMAND}