From 2d0ec7f9000b922e5e180bfa1fe0777e8033e8df Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 28 Jun 2025 22:54:04 +0900 Subject: [PATCH] Revert "pretty-print: also chase symlinks in the last component" This reverts commit 2f2977cab8ee94e5479d86c93c7a4346789a920a. The commit was mistakenly merged without review. Also as pointed at https://github.com/systemd/systemd/pull/37972#discussion_r2173234198 now the output is confusing. Let's revert at least now. --- src/shared/pretty-print.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c index 55bc585b833..8be99a8d3f4 100644 --- a/src/shared/pretty-print.c +++ b/src/shared/pretty-print.c @@ -6,7 +6,6 @@ #include #include "alloc-util.h" -#include "chase.h" #include "color-util.h" #include "conf-files.h" #include "constants.h" @@ -419,16 +418,12 @@ int conf_files_cat(const char *root, const char *name, CatFlags flags) { /* First locate the main config file, if any */ if (!is_collection) { STRV_FOREACH(prefix, prefixes) { - _cleanup_free_ char *p = path_join(*prefix, name); - if (!p) + path = path_join(root, *prefix, name); + if (!path) return log_oom(); - - r = chase_and_access(p, root, CHASE_PREFIX_ROOT, F_OK, &path); - if (r < 0) { - if (r != -ENOENT) - log_debug_errno(r, "Failed to chase %s%s, ignoring: %m", strempty(root), p); - continue; - } + if (access(path, F_OK) == 0) + break; + path = mfree(path); } if (!path) @@ -439,7 +434,7 @@ int conf_files_cat(const char *root, const char *name, CatFlags flags) { } /* Then locate the drop-ins, if any */ - r = conf_files_list_strv(&files, extension, root, CONF_FILES_CHASE_BASENAME, (const char* const*) dirs); + r = conf_files_list_strv(&files, extension, root, 0, (const char* const*) dirs); if (r < 0) return log_error_errno(r, "Failed to query file list: %m"); -- 2.47.3