summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2014-05-03 11:52:13 +0300
committerLennart Poettering <lennart@poettering.net>2014-05-16 18:47:36 +0200
commit66379f841ec6129e4c2c3a2bbc39a1f54000ed2f (patch)
treeef2536256a15f6d5548092975546a8bf09272cc5 /src/shared
parent7cb9c51ce81818c200f27de4db4a4076cbe4265b (diff)
path-lookup: don't hardcode .config
If XDG_CONFIG_HOME is set, then we should respect that.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/path-lookup.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index c6b4ba1e22..e072fd6092 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -125,6 +125,8 @@ static char** user_dirs(
goto fail;
} else if (home) {
+ _cleanup_free_ char *data_home_parent = NULL;
+
if (asprintf(&data_home, "%s/.local/share/systemd/user", home) < 0)
goto fail;
@@ -135,8 +137,14 @@ static char** user_dirs(
* then filter out this link, if it is actually is
* one. */
- mkdir_parents_label(data_home, 0777);
- (void) symlink("../../../.config/systemd/user", data_home);
+ if (path_get_parent(data_home, &data_home_parent) >= 0) {
+ _cleanup_free_ char *config_home_relative = NULL;
+
+ if (path_make_relative(data_home_parent, config_home, &config_home_relative) >= 0) {
+ mkdir_parents_label(data_home, 0777);
+ (void) symlink(config_home_relative, data_home);
+ }
+ }
}
e = getenv("XDG_DATA_DIRS");