From 06d3d46b881daf69180d67aaeea6ed07126ac7f2 Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Wed, 29 Jun 2016 17:10:06 +0900 Subject: [PATCH] Change user default home directory before: user default directory = /home After: user default directory = $TZ_SYS_HOME$ Signed-off-by: Yunmi Ha Change-Id: I1e4900b8a97544f3eff12a71346a9fee21ffe304 --- configure.ac | 4 ++++ packaging/gumd.spec | 1 + src/common/Makefile.am | 1 + src/common/gum-config.c | 13 +++++++++++-- 4 files changed, 17 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/common/gum-config.c diff --git a/configure.ac b/configure.ac index 3d3534e..2f36fde 100644 --- a/configure.ac +++ b/configure.ac @@ -48,6 +48,10 @@ AC_CHECK_HEADERS([string.h]) AC_CHECK_HEADERS([sys/xattr.h attr/xattr.h],[break]) AC_CHECK_FUNCS(llistxattr lgetxattr lsetxattr) +PKG_CHECK_MODULES(TZ_PLATFORM_CONFIG, libtzplatform-config) +AC_SUBST(TZ_PLATFORM_CONFIG_CFLAGS) +AC_SUBST(TZ_PLATFORM_CONFIG_LIBS) + # Crypt library. AC_SEARCH_LIBS([crypt],[crypt], CRYPT_LIB="-l$ac_lib", CRYPT_LIB="") AC_SUBST(CRYPT_LIB) diff --git a/packaging/gumd.spec b/packaging/gumd.spec index 943d6f7..751eaf7 100644 --- a/packaging/gumd.spec +++ b/packaging/gumd.spec @@ -29,6 +29,7 @@ BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(libtzplatform-config) Requires: tizen-platform-config %description diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 2695c11..b5d9723 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -16,6 +16,7 @@ libgum_common_la_DEPENDENCIES = \ libgum_common_la_LIBADD = \ $(top_builddir)/src/common/dbus/libgum-dbus-glue.la \ $(GUM_COMMON_LIBS) \ + $(TZ_PLATFORM_CONFIG_LIBS) \ $(NULL) gum_common_pubhdr = $(top_srcdir)/include/gum/common diff --git a/src/common/gum-config.c b/src/common/gum-config.c old mode 100644 new mode 100755 index 81e10bb..c604ffd --- a/src/common/gum-config.c +++ b/src/common/gum-config.c @@ -32,6 +32,8 @@ #include #include #include +#include + #include "config.h" #include "common/gum-config.h" @@ -619,6 +621,8 @@ static void _gum_config_initialize ( GumConfig *self) { + const gchar *home_path = tzplatform_getenv(TZ_SYS_HOME); + gum_config_set_string (self, GUM_CONFIG_GENERAL_PASSWD_FILE, GUM_PASSWD_FILE); gum_config_set_string (self, GUM_CONFIG_GENERAL_SHADOW_FILE, @@ -627,8 +631,13 @@ _gum_config_initialize ( GUM_GROUP_FILE); gum_config_set_string (self, GUM_CONFIG_GENERAL_GSHADOW_FILE, GUM_GSHADOW_FILE); - gum_config_set_string (self, GUM_CONFIG_GENERAL_HOME_DIR_PREF, - GUM_HOME_DIR_PREFIX); + + if (NULL != home_path) { + gum_config_set_string (self, GUM_CONFIG_GENERAL_HOME_DIR_PREF, home_path); + } else { + gum_config_set_string (self, GUM_CONFIG_GENERAL_HOME_DIR_PREF, GUM_HOME_DIR_PREFIX); + } + gum_config_set_string (self, GUM_CONFIG_GENERAL_SHELL, GUM_SHELL); gum_config_set_string (self, GUM_CONFIG_GENERAL_SKEL_DIR, GUM_SKEL_DIR); -- 2.7.4