From: Alan Jenkins <alan.christopher.jenkins@gmail.com>
Date: Mon, 2 Oct 2017 13:40:15 +0000 (+0100)
Subject: core: distinguish "Killing"/"Terminating"/"Stopping" for mount unit timeout
X-Git-Tag: v236~272^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=79aafbd122eba37df6512f2071cd2c3cf59d46ee;p=platform%2Fupstream%2Fsystemd.git

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

Update the timeout warnings for remount and unmount.  For consistency with
mount, for accuracy, and for consistency with their equivalents in
service.c.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 9fde132..9b58207 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -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;