Initial values XSD moved into read only directory.

Change-Id: I200465912b82eae0b75228273e0af7cafe53ec7d

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index f5b8cc6..9d32beb 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -129,10 +129,10 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 cp LICENSE %{buildroot}/usr/share/license/libkey-manager-client
 cp LICENSE %{buildroot}/usr/share/license/libkey-manager-control-client
 mkdir -p %{buildroot}/opt/data/ckm/initial_values
-cp doc/initial_values.xsd %{buildroot}/opt/data/ckm/initial_values
 mkdir -p %{buildroot}/etc/security/
 mkdir -p %{buildroot}/usr/share/ckm/scripts
 cp data/scripts/*.sql %{buildroot}/usr/share/ckm/scripts
+cp doc/initial_values.xsd %{buildroot}/usr/share/ckm
 mkdir -p %{buildroot}/usr/share/ckm-db-test
 cp tests/testme_ver1.db %{buildroot}/usr/share/ckm-db-test/
 cp tests/testme_ver2.db %{buildroot}/usr/share/ckm-db-test/
@@ -224,8 +224,9 @@ fi
 %{_unitdir}/central-key-manager-api-ocsp.socket
 %{_datadir}/license/%{name}
 %{_datadir}/ckm/scripts/*.sql
-/opt/data/ckm/initial_values/initial_values.xsd
 %{_datadir}/
+%{_datadir}/ckm/initial_values.xsd
+/opt/data/ckm/initial_values/
 %attr(444, root, root) %{_datadir}/ckm/scripts/*.sql
 /etc/opt/upgrade/230.key-manager-migrate-dkek.patch.sh
 /etc/gumd/userdel.d/10_key-manager.post

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index 2f3c247..9a14ef2 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -39,7 +39,7 @@
 namespace {
 const char * const CERT_SYSTEM_DIR          = "/etc/ssl/certs";
 const char * const INIT_VALUES_DIR          = "/opt/data/ckm/initial_values/";
-const char * const INIT_VALUES_XSD          = "/opt/data/ckm/initial_values/initial_values.xsd";
+const char * const INIT_VALUES_XSD          = "/usr/share/ckm/initial_values.xsd";
 const char * const INIT_VALUES_FILE_SUFFIX  = ".xml";
 const char * const SYSTEM_DB_PASSWD         = "cAtRugU7";