systemctl: skip native unit file handling if sysv file handling already handled everything

Issue pointed out by Colin Guthrie.
This commit is contained in:
Lennart Poettering 2014-01-20 13:43:20 +01:00
parent 488ad3b32a
commit 67d6621059

View File

@ -4740,6 +4740,11 @@ static int enable_unit(sd_bus *bus, char **args) {
if (r < 0) if (r < 0)
return r; return r;
/* If the operation was fully executed by the SysV compat,
* let's finish early */
if (strv_isempty(names))
return 0;
if (!bus || avoid_bus()) { if (!bus || avoid_bus()) {
if (streq(verb, "enable")) { if (streq(verb, "enable")) {
r = unit_file_enable(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes); r = unit_file_enable(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes);