summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-03-27 04:21:16 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:39 -0500
commitc95d46804680dc29cbf132f3391411f356c9ddbc (patch)
treebde89909c9fbf7e557a2597cab47f785c1cf1786 /source4/script
parent90d8786d051f79ca100a211640b1bf9c737ec358 (diff)
downloadsamba-c95d46804680dc29cbf132f3391411f356c9ddbc.tar.gz
samba-c95d46804680dc29cbf132f3391411f356c9ddbc.tar.bz2
samba-c95d46804680dc29cbf132f3391411f356c9ddbc.zip
r21970: Ensure that Fedora DS can be shut down correctly with the stop script:
This needs the pid file to be in the right spot. Andrew Bartlett (This used to be commit cf9993a309ffe605610e4aaa2281576f319b5df0)
Diffstat (limited to 'source4/script')
-rw-r--r--source4/script/tests/Samba4.pm2
-rwxr-xr-xsource4/script/tests/mk-fedora-ds.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index 0a92f36dc8..54d1d62167 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -23,7 +23,7 @@ sub slapd_start($$$)
# running slapd in the background means it stays in the same process group, so it can be
# killed by timelimit
if (defined($ENV{FEDORA_DS_PREFIX})) {
- system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $ENV{FEDORA_DS_DIR} -d$ENV{FEDORA_DS_LOGLEVEL} > $ENV{LDAPDIR}/logs 2>&1 &");
+ system("$ENV{FEDORA_DS_PREFIX}/sbin/ns-slapd -D $ENV{FEDORA_DS_DIR} -d$ENV{FEDORA_DS_LOGLEVEL} -i $ENV{FEDORA_DS_PIDFILE}> $ENV{LDAPDIR}/logs 2>&1 &");
} else {
my $oldpath = $ENV{PATH};
$ENV{PATH} = "/usr/local/sbin:/usr/sbin:/sbin:$ENV{PATH}";
diff --git a/source4/script/tests/mk-fedora-ds.sh b/source4/script/tests/mk-fedora-ds.sh
index 7ea012d0cb..d828c5415c 100755
--- a/source4/script/tests/mk-fedora-ds.sh
+++ b/source4/script/tests/mk-fedora-ds.sh
@@ -7,6 +7,8 @@ echo "FEDORA_DS_LOGLEVEL=0"
FEDORA_DS_DIR=$LDAPDIR/slapd-samba4
echo FEDORA_DS_DIR=$FEDORA_DS_DIR
+echo "FEDORA_DS_PIDFILE=$FEDORA_DS_DIR/logs/slapd-samba4.pid"
+
cat >$FEDORA_DS_INF <<EOF
[General]
SuiteSpotUserID = $ROOT