From 28365e88d0dfc6332b26120e23b2c39b7958f907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 1 Aug 2020 12:25:56 +0200 Subject: [PATCH] analyze: fix 'cat-config systemd/zram-generator.conf' Also makes this work for various systemd config files that support .d. --- src/shared/pretty-print.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c index 69bae6883c..edba23985f 100644 --- a/src/shared/pretty-print.c +++ b/src/shared/pretty-print.c @@ -234,6 +234,12 @@ static int guess_type(const char **name, char ***prefixes, bool *is_collection, if (!n) return log_oom(); + /* All systemd-style config files should support the /usr-/etc-/run split and + * dropins. Let's add a blanket rule that allows us to support them without keeping + * an explicit list. */ + if (path_startswith(n, "systemd") && endswith(n, ".conf")) + usr = true; + delete_trailing_chars(n, "/"); if (endswith(n, ".d"))