Remove hardcoded path for multiuser support

Bug-Tizen: PTREL-356

Change-Id: Ie9f53d5c8c52e76dab93297a2f7214fdd3b0bb5f
Signed-off-by: Jean-Benoit MARTIN <jean-benoit.martin@open.eurogiciel.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bad71e9..28d168d 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(glib_pkg REQUIRED gobject-2.0)
-pkg_check_modules(pkgs REQUIRED glib-2.0 dlog vconf-internal-keys)
+pkg_check_modules(pkgs REQUIRED glib-2.0 dlog libtzplatform-config vconf-internal-keys)
 
 FOREACH(flag ${pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
@@ -58,7 +58,7 @@ INSTALL(TARGETS vconftool DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/vconf-keys.h DESTINATION include/${PROJECT_NAME})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/kdb_first_boot DESTINATION /opt/var/kdb)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/kdb_first_boot DESTINATION ${TZ_SYS_CONFIG})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/vconf-init DESTINATION ${BINDIR}  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/vconf-setup DESTINATION /etc/preconf.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 

diff --git a/include/vconf-internals.h b/include/vconf-internals.h
index 310bc50..b0c68d7 100755 (executable)
--- a/include/vconf-internals.h
+++ b/include/vconf-internals.h
@@ -38,7 +38,7 @@
 #define BACKEND_FILE_PREFIX "file/"
 #define BACKEND_MEMORY_PREFIX "memory/"
 
-#define BACKEND_SYSTEM_DIR "/opt/var/kdb/"
+#define BACKEND_SYSTEM_DIR tzplatform_getenv(TZ_SYS_CONFIG)
 #define BACKEND_MEMORY_DIR "/var/run/"
 
 /* This value can be optimized according to the device characteristcs and file system configuration */

diff --git a/packaging/vconf.spec b/packaging/vconf.spec
index d4e60e6..413fefd 100755 (executable)
--- a/packaging/vconf.spec
+++ b/packaging/vconf.spec
@@ -14,6 +14,7 @@ BuildRequires:  cmake
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(vconf-internal-keys)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description 
 Configuration system library
@@ -42,14 +43,15 @@ Vconf key management header files
 cp %{SOURCE1001} .
 
 %build
-%cmake .
+%cmake . \
+       -DTZ_SYS_CONFIG=%{TZ_SYS_CONFIG}
 
 make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}/opt/var/kdb/db
-mkdir -p %{buildroot}/opt/var/kdb/db/.backup
+mkdir -p %{buildroot}%{TZ_SYS_CONFIG}/db
+mkdir -p %{buildroot}%{TZ_SYS_CONFIG}/db/.backup
 mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
 mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -m0644 %SOURCE1 %{buildroot}%{_unitdir}/
@@ -71,10 +73,10 @@ systemctl daemon-reload
 %attr(755,root,root) %{_sysconfdir}/preconf.d/vconf-setup
 %{_bindir}/vconftool
 %{_bindir}/vconf-init
-%config(missingok) %attr(644,root,root) /opt/var/kdb/kdb_first_boot
+%config(missingok) %attr(644,root,root) %{TZ_SYS_CONFIG}/kdb_first_boot
 %{_libdir}/*.so.*
-%dir %attr(777,root,root) /opt/var/kdb/db
-%dir %attr(777,root,root) /opt/var/kdb/db/.backup
+%dir %attr(777,root,root) %{TZ_SYS_CONFIG}/db
+%dir %attr(777,root,root) %{TZ_SYS_CONFIG}/db/.backup
 %{_unitdir}/basic.target.wants/vconf-setup.service
 %{_unitdir}/vconf-setup.service
 %{_prefix}/lib/tmpfiles.d/vconf-setup.conf

diff --git a/vconf-init b/vconf-init
index c3304e9..cee45b8 100755 (executable)
--- a/vconf-init
+++ b/vconf-init
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+source /etc/tizen-platform.conf
+
 mkdir /var/run/memory
 chmod 777 /var/run/memory
 
 set -e
 
 
-cp -a /opt/var/kdb/memory_init/memory/* /var/run/memory
+cp -a ${TZ_SYS_CONFIG}/memory_init/memory/* /var/run/memory

diff --git a/vconf.c b/vconf.c
index d1474b1..382861f 100755 (executable)
--- a/vconf.c
+++ b/vconf.c
@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 #include <sys/xattr.h>
 #include <ctype.h>
+#include <tzplatform_config.h>
 
 #ifndef API
 #define API __attribute__ ((visibility("default")))
@@ -40,11 +41,11 @@
 #ifdef VCONF_USE_SQLFS_TRANSACTION
 int IN_SBOX=0;
 
-#define VCONF_MOUNT_PATH "/opt/var/kdb/db"
+#define VCONF_MOUNT_PATH tzplatform_mkpath(TZ_SYS_CONFIG,"db")
 #define VCONF_MOUNT_PATH_CHECK \
 do{\
        if(!IN_SBOX) \
-      IN_SBOX = access("/opt/var/kdb/kdb_first_boot", F_OK) + 2; \
+      IN_SBOX = access(tzplatform_mkpath(TZ_SYS_CONFIG,"kdb_first_boot"), F_OK) + 2; \
        if(2==IN_SBOX) return 0;\
 }while(0)
 

diff --git a/vconftool.c b/vconftool.c
index 74045c4..de7fc61 100755 (executable)
--- a/vconftool.c
+++ b/vconftool.c
@@ -33,7 +33,7 @@
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <errno.h>
-
+#include <tzplatform_config.h>
 #include <wordexp.h>
 
 enum {
@@ -45,15 +45,15 @@ enum {
 };
 
 #define BUFSIZE                1024
+#define DB_PREFIX tzplatform_getenv(TZ_SYS_CONFIG)
+#define FILE_PREFIX tzplatform_getenv(TZ_SYS_CONFIG)
+#define MEMORY_INIT tzplatform_mkpath(TZ_SYS_CONFIG,"memory_init")
 
 const char *BACKEND_DB_PREFIX = "db/";
 const char *BACKEND_FILE_PREFIX = "file/";
 const char *BACKEND_MEMORY_PREFIX = "memory/";
 
-const char *DB_PREFIX = "/opt/var/kdb";
-const char *FILE_PREFIX = "/opt/var/kdb";
 const char *MEMORY_PREFIX = "/var/run";
-const char *MEMORY_INIT = "/opt/var/kdb/memory_init";
 
 static char *guid = NULL;
 static char *uid = NULL;