summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2005-09-16 20:01:26 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2005-09-16 20:01:26 +0000
commite25eab948f2d1706a0996da388e6e16c74efc8e3 (patch)
tree6b67a4ad3448a35424954710ee1c497750ec5a86
parent14772c5c1f3e5a718fc36d0f9a541cc3abed4ec4 (diff)
downloadds-e25eab948f2d1706a0996da388e6e16c74efc8e3.tar.gz
ds-e25eab948f2d1706a0996da388e6e16c74efc8e3.tar.xz
ds-e25eab948f2d1706a0996da388e6e16c74efc8e3.zip
[160003] db2index.pl cannot find libldap50.so if only certain parameters are used
1) Makefile: SP packages ns-config and needed libraries 2) slapd-patch.inf: call "ns-config -r" in the pre install phase; "ns-update" in the post install phase.
-rw-r--r--ldap/cm/Makefile7
-rw-r--r--ldap/cm/newinst/slapd-patch.inf6
2 files changed, 13 insertions, 0 deletions
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 3a2dd4e5..bbb61f52 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -820,6 +820,13 @@ ifdef BUILD_PATCH
echo "ComponentInfoFile = $(SLAPDSP)/$(SLAPDSP).inf" >> $(PATCHINSTDIR)/setup.inf
# create a zip file based upon the $(PATCHINF) file
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); zip -r $(PATCHINSTDIR)/$(SLAPDSP)/ns$(SLAPDSP).zip `egrep file: $(PATCHINF) | awk -F: '{print $$3}'`
+# put ns-config and needed libs in the $(PATCHINSTDIR)/$(SLAPDSP) directory
+ $(INSTALL) -m 755 $(RELDIR_32)/bin/slapd/admin/bin/ns-config $(PATCHINSTDIR)/$(SLAPDSP)
+ -@for file in $(PACKAGE_SETUP_LIBS_32) ; \
+ do if [ -f $$file ] ; \
+ then $(INSTALL) -m 755 $$file $(PATCHINSTDIR)/$(SLAPDSP) ; \
+ fi ; \
+ done
# create patch inf file: $(SLAPD).inf
cp $(OBJDIR)/slapd-patch.inf $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf
cd $(ABSRELDIR)/slapd/$(NS_BUILD_FLAVOR); ls `egrep file: $(PATCHINF) | egrep -v "setup/setup" | awk -F: '{print $$3}'` > $(PATCHINSTDIR)/$(SLAPDSP)/$(SLAPDSP).inf.tmp
diff --git a/ldap/cm/newinst/slapd-patch.inf b/ldap/cm/newinst/slapd-patch.inf
index adfe9060..3896a162 100644
--- a/ldap/cm/newinst/slapd-patch.inf
+++ b/ldap/cm/newinst/slapd-patch.inf
@@ -42,11 +42,17 @@ Components=slapd-71sp1
[slapd-71sp1]
Name= %%%SERVER_NAME%%%
+InstanceNamePrefix= %%%INSTANCE_NAME_PREFIX%%%
Description= %%%SERVER_NAME%%%
NickName= slapd-71sp1
Version= %%%SERVER_VERSION%%%
BuildNumber= %%%SERVER_BUILD_NUM%%%
Archive= nsslapd-71sp1.zip
SourcePath=slapd-71sp1
+PreInstall= ns-config -r
+PostInstall= bin/slapd/admin/bin/ns-update
+PreUninstall= bin/slapd/admin/bin/uninstall
+PostUninstall=
Checked=True
Mandatory=False
+IsLdap=True