mirror of
https://github.com/systemd/systemd-stable.git
synced 2024-10-27 01:55:32 +03:00
Merge pull request #7217 from sourcejedi/stopfail-stop
2 small fixes, stopping mount and service units
This commit is contained in:
commit
4d11c049a2
@ -1363,7 +1363,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user
|
||||
break;
|
||||
|
||||
case MOUNT_REMOUNTING:
|
||||
log_unit_warning(UNIT(m), "Remounting timed out. Killing remount process.");
|
||||
log_unit_warning(UNIT(m), "Remounting timed out. Terminating remount process.");
|
||||
mount_set_reload_result(m, MOUNT_FAILURE_TIMEOUT);
|
||||
mount_enter_signal(m, MOUNT_REMOUNTING_SIGTERM, MOUNT_SUCCESS);
|
||||
break;
|
||||
@ -1388,7 +1388,7 @@ static int mount_dispatch_timer(sd_event_source *source, usec_t usec, void *user
|
||||
break;
|
||||
|
||||
case MOUNT_UNMOUNTING:
|
||||
log_unit_warning(UNIT(m), "Unmounting timed out. Stopping.");
|
||||
log_unit_warning(UNIT(m), "Unmounting timed out. Terminating.");
|
||||
mount_enter_signal(m, MOUNT_UNMOUNTING_SIGTERM, MOUNT_FAILURE_TIMEOUT);
|
||||
break;
|
||||
|
||||
|
@ -2087,7 +2087,7 @@ static void service_run_next_control(Service *s) {
|
||||
fail:
|
||||
log_unit_warning_errno(UNIT(s), r, "Failed to run next control task: %m");
|
||||
|
||||
if (IN_SET(s->state, SERVICE_START_PRE, SERVICE_STOP))
|
||||
if (IN_SET(s->state, SERVICE_START_PRE, SERVICE_START_POST, SERVICE_STOP))
|
||||
service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
|
||||
else if (s->state == SERVICE_STOP_POST)
|
||||
service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
|
||||
|
Loading…
Reference in New Issue
Block a user