From 7e20f33c006aba169e2fc86f7bb55197d84400a4 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 6 May 2013 20:12:47 -0400
Subject: Fixed incorrect JNI_JAR_DIR.

The JNI_JAR_DIR is supposed to be architecture-specific but the
pki-base package is architecture-neutral. So, to ensure it has the
correct value, the variable will be set at post installation.
Also, to simplify the upgrade process, the variable has been moved
from /etc/pki/pki.conf into /usr/share/pki/etc/pki.conf. The build,
deployment, startup, and upgrade scripts have been modified
accordingly.
---
 base/common/CMakeLists.txt                 | 7 ++++++-
 base/common/etc/pki.conf                   | 2 ++
 base/common/share/etc/pki.conf             | 3 ---
 base/common/upgrade/10.0.1/01-AddJniJarDir | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 base/common/etc/pki.conf

(limited to 'base/common')

diff --git a/base/common/CMakeLists.txt b/base/common/CMakeLists.txt
index efdec85c4..3798503c0 100644
--- a/base/common/CMakeLists.txt
+++ b/base/common/CMakeLists.txt
@@ -6,6 +6,11 @@ configure_file(
     ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf
 )
 
+configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/etc/pki.conf
+    ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf
+)
+
 install(
     FILES
         ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf
@@ -15,7 +20,7 @@ install(
 
 install(
     FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/share/etc/pki.conf
+        ${CMAKE_CURRENT_BINARY_DIR}/etc/pki.conf
     DESTINATION
         ${SYSCONF_INSTALL_DIR}/pki/
 )
diff --git a/base/common/etc/pki.conf b/base/common/etc/pki.conf
new file mode 100644
index 000000000..3e5a5e154
--- /dev/null
+++ b/base/common/etc/pki.conf
@@ -0,0 +1,2 @@
+# RESTEasy library
+RESTEASY_LIB=${RESTEASY_LIB}
diff --git a/base/common/share/etc/pki.conf b/base/common/share/etc/pki.conf
index 8b16efd4b..f3523442a 100644
--- a/base/common/share/etc/pki.conf
+++ b/base/common/share/etc/pki.conf
@@ -1,5 +1,2 @@
-# RESTEasy library
-RESTEASY_LIB=${RESTEASY_LIB}
-
 # JNI jar file location
 JNI_JAR_DIR=${JNI_JAR_DIR}
diff --git a/base/common/upgrade/10.0.1/01-AddJniJarDir b/base/common/upgrade/10.0.1/01-AddJniJarDir
index ea92640b5..212ffbdeb 100755
--- a/base/common/upgrade/10.0.1/01-AddJniJarDir
+++ b/base/common/upgrade/10.0.1/01-AddJniJarDir
@@ -47,6 +47,8 @@ class AddJniJarDir(pki.upgrade.PKIUpgradeScriptlet):
         # find JNI_JAR_DIR
         if conf.index('JNI_JAR_DIR') >= 0:
             # already exists
+            conf.set('JNI_JAR_DIR', default_path)
+            conf.write()
             return
 
         # find RESTEASY_LIB
-- 
cgit