mirror of
https://github.com/systemd/systemd.git
synced 2025-03-19 22:50:17 +03:00
systemctl: do not try to acquire triggering units for template units
(cherry picked from commit 09d6038d833468ba7c24c658597387ef699ca4fd)
This commit is contained in:
parent
67e0d09368
commit
f414ca0ee3
@ -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) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user