diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-17 19:39:29 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-12-17 19:39:29 +0100 |
| commit | 40f41f34d4af15d0147b5b2525f0b87ff62eae9a (patch) | |
| tree | d4f998414eb62586a59534e875b5fb85f210d116 /src/core/automount.c | |
| parent | 415d7d774ab8bb46fae18dbb8aa4a69e0ad88b57 (diff) | |
| download | systemd-40f41f34d4af15d0147b5b2525f0b87ff62eae9a.tar.gz | |
Revert "core: Propagate condition failed state to triggering units."
This reverts commit 12ab94a1e4961a39c32efb60b71866ab588d3ea2.
Diffstat (limited to 'src/core/automount.c')
| -rw-r--r-- | src/core/automount.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 70dbbb637d..5adec9e966 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -811,11 +811,6 @@ static void automount_enter_running(Automount *a) { goto fail; } - if (unit_has_failed_condition_or_assert(trigger)) { - automount_enter_dead(a, AUTOMOUNT_FAILURE_MOUNT_CONDITION_FAILED); - return; - } - r = manager_add_job(UNIT(a)->manager, JOB_START, trigger, JOB_REPLACE, NULL, &error, NULL); if (r < 0) { log_unit_warning(UNIT(a), "Failed to queue mount startup job: %s", bus_error_message(&error, r)); @@ -1104,12 +1099,11 @@ static int automount_can_start(Unit *u) { } static const char* const automount_result_table[_AUTOMOUNT_RESULT_MAX] = { - [AUTOMOUNT_SUCCESS] = "success", - [AUTOMOUNT_FAILURE_RESOURCES] = "resources", - [AUTOMOUNT_FAILURE_START_LIMIT_HIT] = "start-limit-hit", - [AUTOMOUNT_FAILURE_MOUNT_START_LIMIT_HIT] = "mount-start-limit-hit", - [AUTOMOUNT_FAILURE_UNMOUNTED] = "unmounted", - [AUTOMOUNT_FAILURE_MOUNT_CONDITION_FAILED] = "mount-condition-failed", + [AUTOMOUNT_SUCCESS] = "success", + [AUTOMOUNT_FAILURE_RESOURCES] = "resources", + [AUTOMOUNT_FAILURE_START_LIMIT_HIT] = "start-limit-hit", + [AUTOMOUNT_FAILURE_MOUNT_START_LIMIT_HIT] = "mount-start-limit-hit", + [AUTOMOUNT_FAILURE_UNMOUNTED] = "unmounted", }; DEFINE_STRING_TABLE_LOOKUP(automount_result, AutomountResult); |