From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Nov 2021 13:05:31 +0000 (+0100)
Subject: analyze: don't list filesystems among ungrouped that are aliases
X-Git-Tag: v250-rc1~247^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e0f89b065696c45933dba09c553521ef27da9e08;p=thirdparty%2Fsystemd.git

analyze: don't list filesystems among ungrouped that are aliases

There are a bunch of filesystems that actually are just aliases for
other filesystems. So far we listed them as "ungrouped", suggesting they
should be added to some file system group. But that's not really
something needed, since they are after all not file systems in their own
right, but aliases only (and usually legacy at that).

hence, let's hide them from display (but debug log about them)
---

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 4153afb1c6d..3801cf0eade 100644
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -1944,8 +1944,29 @@ static int dump_filesystems(int argc, char *argv[], void *userdata) {
 
                         strv_sort(l);
 
-                        STRV_FOREACH(filesystem, l)
+                        STRV_FOREACH(filesystem, l) {
+                                const statfs_f_type_t *magic;
+                                bool is_primary = false;
+
+                                assert(fs_type_from_string(*filesystem, &magic) >= 0);
+
+                                for (size_t i = 0; magic[i] != 0; i++) {
+                                        const char *primary;
+
+                                        primary = fs_type_to_string(magic[i]);
+                                        assert(primary);
+
+                                        if (streq(primary, *filesystem))
+                                                is_primary = true;
+                                }
+
+                                if (!is_primary) {
+                                        log_debug("Skipping ungrouped file system '%s', because it's an alias for another one.", *filesystem);
+                                        continue;
+                                }
+
                                 printf("#   %s\n", *filesystem);
+                        }
                 }
 
                 if (k < 0) {