From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 5 Jul 2025 11:01:18 +0000 (+0200)
Subject: systemd-analyze: stop printing Ex transient settings
X-Git-Tag: v258-rc1~150^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F38083%2Fhead;p=thirdparty%2Fsystemd.git

systemd-analyze: stop printing Ex transient settings

The test will fail if we ever add one again in the future by mistake.
---

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 97bf9d264ec..41c88b79cf3 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -2880,9 +2880,11 @@ void bus_dump_transient_settings(UnitType t) {
                 for (const BusProperty *item = *tables; item->convert; item++) {
                         assert(item->name || item->dump);
 
-                        /* Do not print deprecated names */
+                        /* Do not print deprecated names. All "Ex" variants are deprecated. */
                         if (item->convert == warn_deprecated)
                                 continue;
+                        if (item->name && endswith(item->name, "Ex"))
+                                continue;
 
                         if (item->name)
                                 puts(item->name);
diff --git a/test/units/TEST-65-ANALYZE.sh b/test/units/TEST-65-ANALYZE.sh
index 468c9ed0939..61e4a97175c 100755
--- a/test/units/TEST-65-ANALYZE.sh
+++ b/test/units/TEST-65-ANALYZE.sh
@@ -1115,6 +1115,7 @@ systemd-analyze transient-settings mount | grep CPUQuotaPeriodSec
 (! systemd-analyze transient-settings service | grep CPUAccounting )
 (! systemd-analyze transient-settings service | grep ConditionKernelVersion )
 (! systemd-analyze transient-settings service | grep AssertKernelVersion )
+(! systemd-analyze transient-settings service socket timer path slice scope mount automount | grep -E 'Ex$' )
 
 systemd-analyze log-level info