summaryrefslogtreecommitdiffstats
path: root/ldap/admin/src/scripts/template-restoreconfig.in
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2007-02-07 23:57:40 +0000
committerRich Megginson <rmeggins@redhat.com>2007-02-07 23:57:40 +0000
commit44ed8bab7f2de4b295a88230a35f66af72a12d18 (patch)
treebb57e6674feead6fe0598ddf092141af53591ebe /ldap/admin/src/scripts/template-restoreconfig.in
parent67be3511d41496ed3c26f082cbf1eb06d96003cb (diff)
downloadds-44ed8bab7f2de4b295a88230a35f66af72a12d18.tar.gz
ds-44ed8bab7f2de4b295a88230a35f66af72a12d18.tar.xz
ds-44ed8bab7f2de4b295a88230a35f66af72a12d18.zip
esolves: bug 227618
Bug Description: FHS: move exes to _bindir; move ns-slapd to _sbindir Reviewed by: many people (Thanks!) Fix Description: In order to be more FHS compliant, we need to make the following changes: 1) move files executable by end users to _bindir (e.g. /usr/bin) - this means logconv.pl, ds_newinst, dbscan, etc. 2) move the server executable ns-slapd to _sbindir (e.g. /usr/sbin) And, to be more packaging friendly, the additional changes: 3) move libback-ldbm to the plugins dir - it is a plugin 4) use the libtool -avoid-version flag with plugins - we don't need the .so.0.0.0 for plugins I had to add support for sbindir and SBINDIR to create_instance and ds_newinst. We were using serverdir for 3 things - command line programs, server specific shared libs, and the server executable itself. These are now in 3 different places. The biggest change was to the scripts. I kept serverdir and SERVER-DIR to be the location of the server shared libs to avoid changing even more stuff. I had to add SERVERBIN-DIR to the scripts - this is the location of ns-slapd and is set by sbindir in create_instance (which defaults to SBINDIR from Makefile.am which defaults to $prefix/sbin in configure - whew). I've tested instance creation with these diffs - everything seems to work fine. 5) reorder files in alphabetical order - suggested by nkinder 6) add $LDFLAGS to test in db.m4 7) touch all template/wrapper .in files to make them newer than their corresponding files Platforms tested: RHEL4, FC6 Flag Day: no Doc impact: Yes, but the docs will have to change quite a bit for all of the FHS related changes.
Diffstat (limited to 'ldap/admin/src/scripts/template-restoreconfig.in')
-rwxr-xr-xldap/admin/src/scripts/template-restoreconfig.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/ldap/admin/src/scripts/template-restoreconfig.in b/ldap/admin/src/scripts/template-restoreconfig.in
index 90ac5960..dc210cba 100755
--- a/ldap/admin/src/scripts/template-restoreconfig.in
+++ b/ldap/admin/src/scripts/template-restoreconfig.in
@@ -1,12 +1,12 @@
#!/bin/sh
prefix="{{DS-ROOT}}"
-LD_LIBRARY_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+LD_LIBRARY_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
export LD_LIBRARY_PATH
-SHLIB_PATH=$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
+SHLIB_PATH=$prefix/{{SERVER-DIR}}:$prefix@nss_libdir@:$prefix@libdir@:@nss_libdir@
export SHLIB_PATH
-cd {{SERVER-DIR}}
+cd {{SERVERBIN-DIR}}
conf_ldif=`ls -1t {{BAK-DIR}}/{{SERV-ID}}-*.ldif | head -1`
if [ -z "$conf_ldif" ]
then