terminal: add page handling for terminals

[elogind.git] / src / shared / path-lookup.c

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index e072fd60928dfa1e2a493e87e15eaf7e0db6cbd0..7d53d859b6b33c91b04bc434e857bf088a65cb23 100644 (file)
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -125,26 +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;
-
-                /* 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. */
-
-                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");
@@ -284,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)) {
@@ -338,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)) {