From 2e08d2c0e9bede644be993ddaa28157c9f156c10 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 07 May 2013 13:50:59 +0000
Subject: [PATCH] svn merge https://svn.forgerock.org/opendj/trunk/opends@8851 https://svn.forgerock.org/opendj/branches/native-packaging@8851 .
---
opends/resource/bin/_mixed-script.sh | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/opends/resource/bin/_mixed-script.sh b/opends/resource/bin/_mixed-script.sh
index fc49f7f..b25d666 100644
--- a/opends/resource/bin/_mixed-script.sh
+++ b/opends/resource/bin/_mixed-script.sh
@@ -24,7 +24,7 @@
#
#
# Copyright 2008-2010 Sun Microsystems, Inc.
-# Portions Copyright 2011 ForgeRock AS
+# Portions Copyright 2011-2013 ForgeRock AS
# This script is used to invoke processes that might be run on server or
@@ -64,8 +64,6 @@
# Set environment variables
SCRIPT_UTIL_CMD=set-full-environment
export SCRIPT_UTIL_CMD
-NO_CHECK=1
-export NO_CHECK
. "${INSTALL_ROOT}/lib/_script-util.sh"
RETURN_CODE=$?
if test ${RETURN_CODE} -ne 0
@@ -95,8 +93,6 @@
# Set the environment to use the offline properties
SCRIPT_NAME=${OLD_SCRIPT_NAME}.offline
export SCRIPT_NAME
- NO_CHECK=0
- export NO_CHECK
. "${INSTALL_ROOT}/lib/_script-util.sh"
RETURN_CODE=$?
if test ${RETURN_CODE} -ne 0
--
Gitblit v1.10.0