Change elmConfig path for applying read-only root filesystem

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I094e549ab80effb65521944cd3580f3e5e349187

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index 7016f25..c90b4c7 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -138,18 +138,12 @@ void showProgressUI(const std::string type) {
        std::string defaultUserHome(::tzplatform_getenv(TZ_USER_HOME));
        ::tzplatform_reset_user();
 
-       ::tzplatform_set_user(::getuid());
-       std::string currentUserHome(::tzplatform_getenv(TZ_USER_HOME));
-       ::tzplatform_reset_user();
-
-       INFO("Home directory : " + currentUserHome);
-
-       runtime::File shareDirectory(currentUserHome + "/share");
+       runtime::File shareDirectory("/opt/home/root/share");
        if (!shareDirectory.exists()) {
-               shareDirectory.makeDirectory();
+               shareDirectory.makeDirectory(true);
        }
 
-       runtime::File elmConfigDir(currentUserHome + "/share/.elementary");
+       runtime::File elmConfigDir(shareDirectory.getPath() + "/.elementary");
        if (!elmConfigDir.exists()) {
                runtime::File defaultElmConfigDir(defaultUserHome + "/share/.elementary");
                defaultElmConfigDir.copyTo(shareDirectory.getPath());

diff --git a/tools/apps/ode/src/ode-app.c b/tools/apps/ode/src/ode-app.c
index 7beebe9..c82efd2 100755 (executable)
--- a/tools/apps/ode/src/ode-app.c
+++ b/tools/apps/ode/src/ode-app.c
@@ -263,7 +263,7 @@ int launchpad_main(int argc, char *argv[])
 
 int standalone_main(int argc, char *argv[])
 {
-       setenv("HOME", "/root", 1);
+       setenv("HOME", "/opt/home/root", 1);
 
        if (argc < 2) {
                fprintf(stderr, "Other arguments is needed\n");