diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-02 08:11:21 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-10-02 11:11:31 -0400 |
| commit | aa08982d62cf45b59ea6a06c915391f5db1fb86e (patch) | |
| tree | 78d39b1a2802ac06fa1c2242156c4dcf26e03277 /src/shared/path-lookup.c | |
| parent | 4d5dec2389d8e6ce78b45d3058220888f4a93db7 (diff) | |
Fix order and document user unit dirs
Fixup for 718880ba0d 'add a transient user unit directory'.
Diffstat (limited to 'src/shared/path-lookup.c')
| -rw-r--r-- | src/shared/path-lookup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c index d7ed6e9e3c..8f75a8e832 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -162,18 +162,18 @@ static char** user_dirs( if (strv_extend(&r, config_home) < 0) goto fail; - if (runtime_dir) - if (strv_extend(&r, runtime_dir) < 0) + if (!strv_isempty(config_dirs)) + if (strv_extend_strv_concat(&r, config_dirs, "/systemd/user") < 0) goto fail; - if (strv_extend(&r, runtime_unit_path) < 0) + if (strv_extend_strv(&r, (char**) config_unit_paths) < 0) goto fail; - if (!strv_isempty(config_dirs)) - if (strv_extend_strv_concat(&r, config_dirs, "/systemd/user") < 0) + if (runtime_dir) + if (strv_extend(&r, runtime_dir) < 0) goto fail; - if (strv_extend_strv(&r, (char**) config_unit_paths) < 0) + if (strv_extend(&r, runtime_unit_path) < 0) goto fail; if (generator) |