From fc96c05922d1a42d0fbaaa02a67a31e69c667f84 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 16 Jun 2016 17:23:22 -0500 Subject: Fixed Java dependency. The code has been modified to use the JAVA_HOME path specified in the pki.conf. The spec file has been modified to depend specifically on OpenJDK 1.8.0 and to provide the default JAVA_HOME path for the pki.conf. https://fedorahosted.org/pki/ticket/2363 --- base/server/scripts/operations | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'base/server/scripts') diff --git a/base/server/scripts/operations b/base/server/scripts/operations index cbd329a0d..14443c4a5 100644 --- a/base/server/scripts/operations +++ b/base/server/scripts/operations @@ -30,9 +30,11 @@ # 200-254 reserved # -if [ -f /etc/pki/pki.conf ] ; then - . /etc/pki/pki.conf -fi +# Read default PKI configuration. +. /usr/share/pki/etc/pki.conf + +# Read user-defined PKI configuration. +. /etc/pki/pki.conf default_error=0 @@ -920,7 +922,7 @@ verify_symlinks() jni_jar_dir="/usr/share/java" tomcat_dir="/usr/share/tomcat7" else - jni_jar_dir=`. /usr/share/pki/etc/pki.conf && . /etc/pki/pki.conf && echo $JNI_JAR_DIR` + jni_jar_dir="$JNI_JAR_DIR" tomcat_dir="/usr/share/tomcat" fi @@ -1426,6 +1428,7 @@ find_openjdks() # function used by debian to set JAVA_HOME # taken from /etc/init.d/tomcat7 +# TODO: get JAVA_HOME for Debian from pki.conf set_java_home() { find_openjdks @@ -1439,6 +1442,7 @@ set_java_home() JAVA_HOME="$jdir" fi done + export JAVA_HOME } -- cgit