From b431c090beb156434fa057e2a3dd14be6e8b2de1 Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 4 Jan 2024 15:22:42 +0100 Subject: [PATCH 1/2] tree-wide: use SPECIAL_BASIC_TARGET --- src/fsck/fsck.c | 2 +- src/test/test-engine.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 729209fc89..4ec8989a3f 100644 --- a/src/fsck/fsck.c +++ b/src/fsck/fsck.c @@ -54,7 +54,7 @@ static void start_target(const char *target, const char *mode) { log_info("Requesting %s/start/%s", target, mode); /* Start this unit only if we can replace basic.target with it */ - r = bus_call_method(bus, bus_systemd_mgr, "StartUnitReplace", &error, NULL, "sss", "basic.target", target, mode); + r = bus_call_method(bus, bus_systemd_mgr, "StartUnitReplace", &error, NULL, "sss", SPECIAL_BASIC_TARGET, target, mode); /* Don't print a warning if we aren't called during startup */ if (r < 0 && !sd_bus_error_has_name(&error, BUS_ERROR_NO_SUCH_JOB)) diff --git a/src/test/test-engine.c b/src/test/test-engine.c index cf77e7c022..e03d179d4e 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -241,10 +241,10 @@ int main(int argc, char *argv[]) { assert_se( unit_has_dependency(manager_get_unit(m, "non-existing-on-failure.target"), UNIT_ATOM_ON_FAILURE_OF, a)); assert_se( unit_has_dependency(a, UNIT_ATOM_ON_SUCCESS, manager_get_unit(m, "non-existing-on-success.target"))); assert_se( unit_has_dependency(manager_get_unit(m, "non-existing-on-success.target"), UNIT_ATOM_ON_SUCCESS_OF, a)); - assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_FAILURE, manager_get_unit(m, "basic.target"))); - assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_SUCCESS, manager_get_unit(m, "basic.target"))); - assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_FAILURE_OF, manager_get_unit(m, "basic.target"))); - assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_SUCCESS_OF, manager_get_unit(m, "basic.target"))); + assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_FAILURE, manager_get_unit(m, SPECIAL_BASIC_TARGET))); + assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_SUCCESS, manager_get_unit(m, SPECIAL_BASIC_TARGET))); + assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_FAILURE_OF, manager_get_unit(m, SPECIAL_BASIC_TARGET))); + assert_se(!unit_has_dependency(a, UNIT_ATOM_ON_SUCCESS_OF, manager_get_unit(m, SPECIAL_BASIC_TARGET))); assert_se(!unit_has_dependency(a, UNIT_ATOM_PROPAGATES_RELOAD_TO, manager_get_unit(m, "non-existing-on-failure.target"))); assert_se(unit_has_name(a, "a.service")); From 80a8dbb4ea46cdc8f4cd47e488ca038c5ecce3dd Mon Sep 17 00:00:00 2001 From: Antonio Alvarez Feijoo Date: Thu, 4 Jan 2024 15:22:54 +0100 Subject: [PATCH 2/2] run: use SPECIAL_USER_SLICE --- src/run/run.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/run/run.c b/src/run/run.c index 45da75f889..c78d3c6a1d 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -32,6 +32,7 @@ #include "ptyfwd.h" #include "signal-util.h" #include "spawn-polkit-agent.h" +#include "special.h" #include "strv.h" #include "terminal-util.h" #include "unit-def.h" @@ -903,7 +904,7 @@ static int parse_argv_sudo_mode(int argc, char *argv[]) { strv_free_and_replace(arg_cmdline, l); if (!arg_slice) { - arg_slice = strdup("user.slice"); + arg_slice = strdup(SPECIAL_USER_SLICE); if (!arg_slice) return log_oom(); }