diff options
| author | Mike Yuan <me@yhndnzj.com> | 2023-09-26 17:21:23 +0200 |
|---|---|---|
| committer | Mike Yuan <me@yhndnzj.com> | 2023-09-27 23:24:51 +0200 |
| commit | d708bb7c02687f1dfdcb706676cdc31e82e8cfa8 (patch) | |
| tree | 15ed14f9f944778c26e03e1cdd30179f073eed09 /src/systemctl | |
| parent | systemctl-start: suppress the triggering unit warning when --no-warn (diff) | |
| download | systemd-d708bb7c02687f1dfdcb706676cdc31e82e8cfa8.tar.xz systemd-d708bb7c02687f1dfdcb706676cdc31e82e8cfa8.zip | |
systemctl-enable: warn if disabled/masked units has active triggering units
Closes #311
Diffstat (limited to 'src/systemctl')
| -rw-r--r-- | src/systemctl/systemctl-enable.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c index c2d9336d90..4d554444d3 100644 --- a/src/systemctl/systemctl-enable.c +++ b/src/systemctl/systemctl-enable.c @@ -138,7 +138,8 @@ int verb_enable(int argc, char *argv[], void *userdata) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; bool expect_carries_install_info = false; bool send_runtime = true, send_force = true, send_preset_mode = false; - const char *method; + const char *method, *warn_trigger_operation = NULL; + bool warn_trigger_ignore_masked = true; /* suppress "used uninitialized" warning */ sd_bus *bus; if (STR_IN_SET(verb, "mask", "unmask")) { @@ -170,6 +171,9 @@ int verb_enable(int argc, char *argv[], void *userdata) { method = "DisableUnitFilesWithFlagsAndInstallInfo"; expect_carries_install_info = true; send_force = false; + + warn_trigger_operation = "Disabling"; + warn_trigger_ignore_masked = true; } else if (streq(verb, "reenable")) { method = "ReenableUnitFiles"; expect_carries_install_info = true; @@ -185,9 +189,12 @@ int verb_enable(int argc, char *argv[], void *userdata) { expect_carries_install_info = true; ignore_carries_install_info = true; - } else if (streq(verb, "mask")) + } else if (streq(verb, "mask")) { method = "MaskUnitFiles"; - else if (streq(verb, "unmask")) { + + warn_trigger_operation = "Masking"; + warn_trigger_ignore_masked = false; + } else if (streq(verb, "unmask")) { method = "UnmaskUnitFiles"; send_force = false; } else if (streq(verb, "revert")) { @@ -245,6 +252,10 @@ int verb_enable(int argc, char *argv[], void *userdata) { if (r < 0) return r; } + + if (warn_trigger_operation && !arg_quiet && !arg_no_warn) + STRV_FOREACH(unit, names) + warn_triggering_units(bus, *unit, warn_trigger_operation, warn_trigger_ignore_masked); } if (carries_install_info == 0 && !ignore_carries_install_info) |