From 5ea6f7977506b2d8da02b4bcd083cc04f267ee4f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 24 Nov 2009 11:00:12 +1100 Subject: [PATCH] s4:provision Don't bother with a template for the LDAP backend startup script. --- source4/scripting/python/samba/provisionbackend.py | 3 +-- source4/setup/ldap_backend_startup.sh | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 source4/setup/ldap_backend_startup.sh diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py index 595c1bebbb3..04a7a436cfb 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 4a7c765e367..00000000000 --- a/source4/setup/ldap_backend_startup.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -${SLAPD_COMMAND} -- 2.11.4.GIT