Author: rmeggins
Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10890
Added Files:
console-ld-libpath.patch
Log Message:
make sure /opt/fedora-ds/shared/lib is used for shared libs used by the console
console-ld-libpath.patch:
--- NEW FILE console-ld-libpath.patch ---
--- startconsole 26 Oct 2005 23:16:14 -0000 1.4
+++ startconsole 7 Dec 2005 23:50:54 -0000
@@ -26,17 +26,17 @@
then
echo "$0: Your JAVA_HOME environment variable is not set. Please set it
appropriately."
exit 1
fi
#
# Make sure java exists and is executable
#
-if [ ! -f java -a ! -x java ]
+if [ ! -f $JAVA_HOME/java -a ! -x $JAVA_HOME/java ]
then
echo "$0: The java program is not in your path, or is not executable."
exit 1
fi
#
# See if libjava and libjvm exist, and set the lib path. These are linked to by JSS.
#
@@ -53,16 +53,19 @@
LD_LIBRARY_PATH="$LIBJAVA_DIR"
SHLIB_PATH="$LIBJAVA_DIR"
DYLD_PATH="$LIBJAVA_DIR"
else
LD_LIBRARY_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
SHLIB_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
DYLD_PATH="$LIBJAVA_DIR:$LIBJVM_DIR"
fi
+ LD_LIBRARY_PATH=/opt/fedora-ds/shared/lib:${LD_LIBRARY_PATH}
+ SHLIB_PATH=/opt/fedora-ds/shared/lib:${SHLIB_PATH}
+ DYLD_PATH=/opt/fedora-ds/shared/lib:${DYLD_PATH}
export LD_LIBRARY_PATH
export SHLIB_PATH
export DYLD_PATH
fi
#
# Launch the Console
#