From aa08982d62cf45b59ea6a06c915391f5db1fb86e Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Thu, 2 Oct 2014 08:11:21 -0400 Subject: Fix order and document user unit dirs Fixup for 718880ba0d 'add a transient user unit directory'. --- src/shared/path-lookup.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/shared/path-lookup.c') 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) -- cgit v1.2.3-54-g00ecf