From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 30 Jun 2024 11:12:45 +0000 (+0200)
Subject: systemctl: do not try to acquire triggering units for template units
X-Git-Tag: v256.3~12
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=f414ca0ee3bed9b67f76a67d8eb569fda99f5fde;p=systemd%2F.git

systemctl: do not try to acquire triggering units for template units

(cherry picked from commit 09d6038d833468ba7c24c658597387ef699ca4fd)
---

diff --git a/src/systemctl/systemctl-util.c b/src/systemctl/systemctl-util.c
index 0854d3e0aa..38e1f23740 100644
--- a/src/systemctl/systemctl-util.c
+++ b/src/systemctl/systemctl-util.c
@@ -327,14 +327,15 @@ int get_active_triggering_units(sd_bus *bus, const char *unit, bool ignore_maske
         if (r < 0)
                 return r;
 
+        if (unit_name_is_valid(name, UNIT_NAME_TEMPLATE))
+                goto skip;
+
         if (ignore_masked) {
                 r = unit_is_masked(bus, name);
                 if (r < 0)
                         return r;
-                if (r > 0) {
-                        *ret = NULL;
-                        return 0;
-                }
+                if (r > 0)
+                        goto skip;
         }
 
         dbus_path = unit_dbus_path_from_name(name);
@@ -370,6 +371,10 @@ int get_active_triggering_units(sd_bus *bus, const char *unit, bool ignore_maske
 
         *ret = TAKE_PTR(active);
         return 0;
+
+skip:
+        *ret = NULL;
+        return 0;
 }
 
 void warn_triggering_units(sd_bus *bus, const char *unit, const char *operation, bool ignore_masked) {