Revert "core: add IgnoreOnSoftReboot= unit option"

The feature is not ready, postpone it

This reverts commit b80fc61e89.
This commit is contained in:
Luca Boccassi
2023-07-22 23:27:27 +01:00
parent acfff02c8f
commit 3835b9aa4b
18 changed files with 50 additions and 164 deletions
+9 -9
View File
@@ -64,22 +64,22 @@ static int slice_add_parent_slice(Slice *s) {
}
static int slice_add_default_dependencies(Slice *s) {
int r;
assert(s);
if (!UNIT(s)->default_dependencies)
return 0;
/* Make sure slices are unloaded on shutdown */
if (!UNIT(s)->ignore_on_soft_reboot)
return unit_add_two_dependencies_by_name(
UNIT(s),
UNIT_BEFORE, UNIT_CONFLICTS,
SPECIAL_SHUTDOWN_TARGET, true,
UNIT_DEPENDENCY_DEFAULT);
r = unit_add_two_dependencies_by_name(
UNIT(s),
UNIT_BEFORE, UNIT_CONFLICTS,
SPECIAL_SHUTDOWN_TARGET, true, UNIT_DEPENDENCY_DEFAULT);
if (r < 0)
return r;
/* Unless we are meant to survive soft reboot, in which case we need to conflict with
* non-soft-reboot targets. */
return unit_add_dependencies_on_real_shutdown_targets(UNIT(s));
return 0;
}
static int slice_verify(Slice *s) {