[Fedora-directory-commits] ldapserver/ldap/cm/newinst setup, 1.9, 1.9.2.1

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/cm/newinst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4584

Modified Files:
      Tag: Directory71RtmBranch
	setup 
Log Message:
[167478] setup script needs to check the DS instance
if the instance dir exists, run ns-config with "-r".



Index: setup
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/cm/newinst/setup,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- setup	19 Apr 2005 22:07:20 -0000	1.9
+++ setup	2 Sep 2005 23:30:49 -0000	1.9.2.1
@@ -248,9 +248,20 @@
 	echo "SuiteSpotGroup = $group" >> $inffile
 	echo ServerRoot = `pwd` >> $inffile
 
+	# check if ds instance directory exists or not
+	# if it does, run ns-config with the reconfigure option
+	doreconfig=""
+	for x in `ls -d slapd-*`
+	do
+		if [ -d $x ]; then
+			doreconfig="-r"
+			break
+		fi
+	done
+
 	# first, run ds
 	cd bin/slapd/admin/bin
-	./ns-config -f $inffile -l $logfile -m $installmode || doExit
+	./ns-config -f $inffile -l $logfile -m $installmode $doreconfig || doExit
 	cd ../../../..
 
 	# next, run admin