systemctl: warn about triggering units only at the end
Instead of checking each unit separately, check once at the end. This should avoid spurious warnings about a service being triggerable by other stuff.
This commit is contained in:
@@ -1584,11 +1584,6 @@ static int start_unit_one(
|
||||
p = NULL;
|
||||
}
|
||||
|
||||
/* When stopping a unit warn if it can still be triggered by
|
||||
* another active unit (socket, path, timer) */
|
||||
if (!arg_quiet && streq(method, "StopUnit"))
|
||||
check_triggering_units(bus, name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1723,6 +1718,16 @@ static int start_unit(DBusConnection *bus, char **args) {
|
||||
ret = r;
|
||||
goto finish;
|
||||
}
|
||||
|
||||
/* When stopping units, warn if they can still be triggered by
|
||||
* another active unit (socket, path, timer) */
|
||||
if (!arg_quiet && streq(method, "StopUnit")) {
|
||||
if (one_name)
|
||||
check_triggering_units(bus, one_name);
|
||||
else
|
||||
STRV_FOREACH(name, args+1)
|
||||
check_triggering_units(bus, *name);
|
||||
}
|
||||
}
|
||||
|
||||
finish:
|
||||
|
||||
Reference in New Issue
Block a user