From d9b2b9b7578edb367174b1a516f38feb6eb028ae Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 10 Nov 2006 23:45:06 +0000
Subject: [PATCH] Make a number of changes to administrative tools provided with OpenDS.  These are all made under the umbrella of issue #994, but there are individual issues for each change.

---
 opends/resource/bin/start-ds |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/opends/resource/bin/start-ds b/opends/resource/bin/start-ds
index af9570c..f2bee71 100755
--- a/opends/resource/bin/start-ds
+++ b/opends/resource/bin/start-ds
@@ -92,6 +92,11 @@
 STARTING_FILE=${INSTANCE_ROOT}/logs/server.starting
 
 
+# Specify the script name so that it may be provided in command-line usage.
+SCRIPT_NAME_ARG="-Dorg.opends.server.scriptName=start-ds"
+export SCRIPT_NAME_ARG
+
+
 # See if an "-N" or a "--nodetach" argument was provided as a command-line
 # argument.  If it was, then don't use nohup to send to the  background, and
 # send all output to both the console and a lot file.
@@ -114,13 +119,13 @@
 then
   echo $$ > "${PID_FILE}"
   rm -f "${PID_FILE}" "${LOG_FILE}"
-  exec "${JAVA_BIN}" ${JAVA_ARGS} \
+  exec "${JAVA_BIN}" ${JAVA_ARGS} ${SCRIPT_NAME_ARG} \
        org.opends.server.core.DirectoryServer \
        --configClass org.opends.server.extensions.ConfigFileHandler \
        --configFile "${CONFIG_FILE}" "${@}"
 else
   touch "${STARTING_FILE}"
-  nohup "${JAVA_BIN}" ${JAVA_ARGS} \
+  nohup "${JAVA_BIN}" ${JAVA_ARGS} ${SCRIPT_NAME_ARG} \
        org.opends.server.core.DirectoryServer \
        --configClass org.opends.server.extensions.ConfigFileHandler \
        --configFile "${CONFIG_FILE}" "${@}" > "${LOG_FILE}" 2>&1 &

--
Gitblit v1.10.0