Browse Source

Merge pull request #7793 from Michael-Gardner/hpcc-12943

HPCC-12943 Added LD_PRELOAD export to hpcc_setenv

Reviewed-By: Mark Kelly <mark.kelly@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 years ago
parent
commit
483093ab1e
2 changed files with 2 additions and 0 deletions
  1. 1 0
      initfiles/etc/DIR_NAME/environment.conf.in
  2. 1 0
      initfiles/sbin/hpcc_setenv.in

+ 1 - 0
initfiles/etc/DIR_NAME/environment.conf.in

@@ -30,3 +30,4 @@ mpTraceLevel=0
 #dfsSSLCertFile=/certfilepath/certfile
 #dfsSSLPrivateKeyFile=/keyfilepath/keyfile
 jvmoptions=-XX:-UsePerfData
+#java=/absolute/path/to/alternative/libjvm.so

+ 1 - 0
initfiles/sbin/hpcc_setenv.in

@@ -81,6 +81,7 @@ IFS="${OIFS}"
 PATH_PREFIX=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^path *= *" | sed -e 's/^path *= *//'`
 
 export PID=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^pid *= *" | sed -e 's/^pid *= *//'`
+export LD_PRELOAD=`cat ${HPCC_CONFIG} | sed -n "/\[${SECTION}\]/,/\[/p" | grep "^java *= *" | sed -e 's/^java *= *//'`:$LD_PRELOAD
 
 NEW_PATH="${PATH_PREFIX}/bin"
 for D in ${PATH//:/ } ; do