diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2008-06-06 20:21:29 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2008-06-06 20:21:29 +0000 |
| commit | f0343b8c7ffdfbe5c5b527326385c3b37c3ec319 (patch) | |
| tree | eb5bad71e67c18717e8eaadb07460476353e4f8d /pki/base/tks | |
| parent | 32b7aaff3111eadfc459a2c0059259d4c3806330 (diff) | |
| download | pki-f0343b8c7ffdfbe5c5b527326385c3b37c3ec319.tar.gz pki-f0343b8c7ffdfbe5c5b527326385c3b37c3ec319.tar.xz pki-f0343b8c7ffdfbe5c5b527326385c3b37c3ec319.zip | |
Bugzilla Bug #450345: Port Dogtag 1.0.0 to Fedora 9 (32-bit i386 & 64-bit x86_64).
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@50 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/tks')
| -rwxr-xr-x | pki/base/tks/shared/conf/dtomcat5 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pki/base/tks/shared/conf/dtomcat5 b/pki/base/tks/shared/conf/dtomcat5 index ba9a5dca8..3be90ea0d 100755 --- a/pki/base/tks/shared/conf/dtomcat5 +++ b/pki/base/tks/shared/conf/dtomcat5 @@ -192,9 +192,10 @@ _RUNJDB="$JAVA_HOME"/bin/jdb # Set standard CLASSPATH # (always inherit any preset values from the PKI start script) if [ ${OS} = "Linux" ] ; then - # Checking for IcedTea JVM - ICEDTEA_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`" - if [ "${ICEDTEA_JVM}" = "IcedTea" ]; then + # Checking for OpenJDK JVM + OPENJDK_JVM="`java -version 2>&1 | tail -1 | awk '{print $1};'`" + if [ "${OPENJDK_JVM}" = "OpenJDK" ] || + [ "${OPENJDK_JVM}" = "IcedTea" ]; then # using OpenJDK CLASSPATH="$CLASSPATH":"$JAVA_HOME"/lib/rt.jar |