morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 17:06:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

core: distinguish "Killing"/"Terminating"/"Stopping" for mount unit timeout

Browse Source 
Update the timeout warnings for remount and unmount.  For consistency with
mount, for accuracy, and for consistency with their equivalents in
service.c.
This commit is contained in:
Alan Jenkins
2017-10-02 14:40:15 +01:00
parent 41dfa61d35
commit 79aafbd122
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/mount.c
View File

@@ -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;