From 43ba6d721185f9a810761720fcb05103b31d17b7 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Wed, 29 Oct 2008 10:39:44 +0000
Subject: [PATCH] Fix 3534: Provide native Solaris packages (fix also 3533: upgrade fails starting server adding entry ds-cfg-key-id)
---
opends/resource/bin/start-ds | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/opends/resource/bin/start-ds b/opends/resource/bin/start-ds
index 075dcca..ffbfe97 100755
--- a/opends/resource/bin/start-ds
+++ b/opends/resource/bin/start-ds
@@ -38,24 +38,8 @@
INSTALL_ROOT=`pwd`
export INSTALL_ROOT
-if cat ${INSTALL_ROOT}/instance.loc | grep '^/' > /dev/null
-then
- INSTANCE_ROOT=`cat ${INSTALL_ROOT}/instance.loc`
- export INSTANCE_ROOT
-else
- INSTANCE_ROOT=${INSTALL_ROOT}/`cat ${INSTALL_ROOT}/instance.loc`
- export INSTANCE_ROOT
-fi
-
cd "${WORKING_DIR}"
-# Specify the locations of important files that may be used when the server
-# is starting.
-CONFIG_FILE=${INSTANCE_ROOT}/config/config.ldif
-PID_FILE=${INSTANCE_ROOT}/logs/server.pid
-LOG_FILE=${INSTANCE_ROOT}/logs/server.out
-STARTING_FILE=${INSTANCE_ROOT}/logs/server.starting
-
# Specify the script name so that it may be provided in command-line usage.
SCRIPT_NAME="start-ds"
@@ -64,6 +48,8 @@
# Set environment variables
SCRIPT_UTIL_CMD=set-full-environment-and-test-java
export SCRIPT_UTIL_CMD
+CHECK_VERSION=yes
+export CHECK_VERSION
. "${INSTALL_ROOT}/lib/_script-util.sh"
RETURN_CODE=$?
if test ${RETURN_CODE} -ne 0
@@ -71,6 +57,13 @@
exit ${RETURN_CODE}
fi
+# Specify the locations of important files that may be used when the server
+# is starting.
+CONFIG_FILE=${INSTANCE_ROOT}/config/config.ldif
+PID_FILE=${INSTANCE_ROOT}/logs/server.pid
+LOG_FILE=${INSTANCE_ROOT}/logs/server.out
+STARTING_FILE=${INSTANCE_ROOT}/logs/server.starting
+
# See if the provided set of arguments were sufficient for us to be able to
# start the server or perform the requested operation. An exit code of 99
--
Gitblit v1.10.0