svn commit: samba r21970 - in
branches/SAMBA_4_0/source/script/tests: .
abartlet at samba.org
abartlet at samba.org
Tue Mar 27 04:21:16 GMT 2007
Author: abartlet
Date: 2007-03-27 04:21:16 +0000 (Tue, 27 Mar 2007)
New Revision: 21970
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21970
Log:
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
Modified:
branches/SAMBA_4_0/source/script/tests/Samba4.pm
branches/SAMBA_4_0/source/script/tests/mk-fedora-ds.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/Samba4.pm
===================================================================
--- branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-03-27 00:50:53 UTC (rev 21969)
+++ branches/SAMBA_4_0/source/script/tests/Samba4.pm 2007-03-27 04:21:16 UTC (rev 21970)
@@ -23,7 +23,7 @@
# 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}";
Modified: branches/SAMBA_4_0/source/script/tests/mk-fedora-ds.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mk-fedora-ds.sh 2007-03-27 00:50:53 UTC (rev 21969)
+++ branches/SAMBA_4_0/source/script/tests/mk-fedora-ds.sh 2007-03-27 04:21:16 UTC (rev 21970)
@@ -7,6 +7,8 @@
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
More information about the samba-cvs
mailing list