From b953c172bf274352c628ffef7d3ef0ef4c9ce59d Mon Sep 17 00:00:00 2001
From: Matthew Harmsen <mharmsen@redhat.com>
Date: Fri, 8 Mar 2013 20:13:55 -0800
Subject: Bugzilla Bug #919476 - pkispawn crashes due to dangling symlink to
 jss4.jar

---
 base/deploy/src/scriptlets/pkiparser.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'base/deploy/src/scriptlets')

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})
 
-- 
cgit