diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2013-03-08 20:13:55 -0800 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2013-03-08 21:48:23 -0800 |
| commit | b953c172bf274352c628ffef7d3ef0ef4c9ce59d (patch) | |
| tree | ef2fe0e99cd26fba0171e2c2c2ae212a1a09dbb2 /base | |
| parent | c87a65024177ed67cd4ec0f7d533d973f8e1f971 (diff) | |
Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to jss4.jar
Diffstat (limited to 'base')
| -rw-r--r-- | base/deploy/etc/default.cfg | 4 | ||||
| -rw-r--r-- | base/deploy/etc/pki.conf | 2 | ||||
| -rw-r--r-- | base/deploy/src/scriptlets/pkiparser.py | 11 |
3 files changed, 9 insertions, 8 deletions
diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg index faed34044..32e744762 100644 --- a/base/deploy/etc/default.cfg +++ b/base/deploy/etc/default.cfg @@ -272,8 +272,8 @@ pki_nsutil_jar_link=%(pki_tomcat_webapps_subsystem_webinf_lib_path)s/pki-nsutil. # JAR paths # These are used in the processing of pkispawn and are not supposed # to be overwritten by user configuration files -pki_jss_jar=%(arch_java_lib)s/jss4.jar -pki_symkey_jar=%(arch_java_lib)s/symkey.jar +pki_jss_jar=%(jni_jar_dir)s/jss4.jar +pki_symkey_jar=%(jni_jar_dir)s/symkey.jar pki_apache_commons_collections_jar=/usr/share/java/apache-commons-collections.jar pki_apache_commons_lang_jar=/usr/share/java/apache-commons-lang.jar pki_apache_commons_logging_jar=/usr/share/java/apache-commons-logging.jar diff --git a/base/deploy/etc/pki.conf b/base/deploy/etc/pki.conf index 3e5a5e154..24decec52 100644 --- a/base/deploy/etc/pki.conf +++ b/base/deploy/etc/pki.conf @@ -1,2 +1,4 @@ # RESTEasy library RESTEASY_LIB=${RESTEASY_LIB} +# JNI jar file location +JNI_JAR_DIR=${JNI_JAR_DIR} diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py index 32a3da154..639b11820 100644 --- a/base/deploy/src/scriptlets/pkiparser.py +++ b/base/deploy/src/scriptlets/pkiparser.py @@ -170,11 +170,10 @@ class PKIConfigParser: 'source /etc/pki/pki.conf && echo $RESTEASY_LIB', shell=True).strip() - # arch dependent libpath - if config.pki_architecture == 64: - arch_java_lib = '/usr/lib64/java' - else: - arch_java_lib = '/usr/lib/java' + # JNI jar location + jni_jar_dir = subprocess.check_output(\ + 'source /etc/pki/pki.conf && echo $JNI_JAR_DIR', + shell=True).strip() if config.pki_subsystem in config.PKI_TOMCAT_SUBSYSTEMS: default_instance_name = 'pki-tomcat' @@ -194,7 +193,7 @@ class PKIConfigParser: 'pki_subsystem_type': config.pki_subsystem.lower(), 'pki_root_prefix' : config.pki_root_prefix, 'resteasy_lib': resteasy_lib, - 'arch_java_lib': arch_java_lib, + 'jni_jar_dir': jni_jar_dir, 'home_dir': os.path.expanduser("~"), 'pki_hostname': config.pki_hostname}) |