X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpath-lookup.c;h=7d53d859b6b33c91b04bc434e857bf088a65cb23;hb=28622e8f5b28412d97bf2f3a5df49c419be1e2c5;hp=c6b4ba1e22bff59117b7ad90723ab4108ef76226;hpb=12ed81d9c88406234c20e9261ae8c8b992d8bc4d;p=elogind.git

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index c6b4ba1e2..7d53d859b 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -127,16 +127,6 @@ static char** user_dirs(
         } else if (home) {
                 if (asprintf(&data_home, "%s/.local/share/systemd/user", home) < 0)
                         goto fail;
-
-                /* There is really no need for two unit dirs in $HOME,
-                 * except to be fully compliant with the XDG spec. We
-                 * now try to link the two dirs, so that we can
-                 * minimize disk seeks a little. Further down we'll
-                 * then filter out this link, if it is actually is
-                 * one. */
-
-                mkdir_parents_label(data_home, 0777);
-                (void) symlink("../../../.config/systemd/user", data_home);
         }
 
         e = getenv("XDG_DATA_DIRS");
@@ -276,7 +266,7 @@ int lookup_paths_init(
                 }
         }
 
-        if (!path_strv_canonicalize_absolute_uniq(p->unit_path, root_dir))
+        if (!path_strv_resolve_uniq(p->unit_path, root_dir))
                 return -ENOMEM;
 
         if (!strv_isempty(p->unit_path)) {
@@ -330,10 +320,10 @@ int lookup_paths_init(
                                 return -ENOMEM;
                 }
 
-                if (!path_strv_canonicalize_absolute_uniq(p->sysvinit_path, root_dir))
+                if (!path_strv_resolve_uniq(p->sysvinit_path, root_dir))
                         return -ENOMEM;
 
-                if (!path_strv_canonicalize_absolute_uniq(p->sysvrcnd_path, root_dir))
+                if (!path_strv_resolve_uniq(p->sysvrcnd_path, root_dir))
                         return -ENOMEM;
 
                 if (!strv_isempty(p->sysvinit_path)) {