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 97bf9d264ecfc7f0391dfbffd6cef9300cf6dd1a..41c88b79cf3899168431251247d2b3809789e43b 100644 (file)
--- 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 468c9ed09392842a75503907de33215168dff039..61e4a97175cd8ed6f839a5b1e778d20ab17df24a 100755 (executable)
--- 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