diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-12-01 12:49:10 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-12-04 11:07:00 -0700 |
| commit | cc8e2ebf392468831428601403f6e0ca7507c11a (patch) | |
| tree | 175d727a645ed26a8fef0c6d2b28d803663ff2df /base/server/scripts | |
| parent | 7eb362d4955a12835479d2bfaa7d364ea4cd7e1f (diff) | |
| download | pki-cc8e2ebf392468831428601403f6e0ca7507c11a.tar.gz pki-cc8e2ebf392468831428601403f6e0ca7507c11a.tar.xz pki-cc8e2ebf392468831428601403f6e0ca7507c11a.zip | |
Remove legacy multilib JNI_JAR_DIR logic
* Bugzilla Bug #1165351 - Errata TPS test fails due to dependent packages not
found
(cherry picked from commit d7a0807b7493fc3d86900ee4aaf8199efd824907)
Conflicts:
base/java-tools/templates/pki_java_command_wrapper.in
base/java-tools/templates/pretty_print_cert_command_wrapper.in
base/java-tools/templates/pretty_print_crl_command_wrapper.in
base/server/python/pki/server/deployment/pkiparser.py
base/server/scripts/operations
(cherry picked from commit c8d73ade2c651fd5ca01226c89d5d19828bfc9b7)
Diffstat (limited to 'base/server/scripts')
| -rw-r--r-- | base/server/scripts/operations | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/server/scripts/operations b/base/server/scripts/operations index 37094c037..209369182 100644 --- a/base/server/scripts/operations +++ b/base/server/scripts/operations @@ -1094,7 +1094,7 @@ verify_symlinks() jni_jar_dir="/usr/share/java" tomcat_dir="/usr/share/tomcat7" else - jni_jar_dir=`source /usr/share/pki/etc/pki.conf && echo $JNI_JAR_DIR` + jni_jar_dir=`source /usr/share/pki/etc/pki.conf && source /etc/pki/pki.conf && echo $JNI_JAR_DIR` tomcat_dir="/usr/share/tomcat" fi |