diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-01-29 14:58:04 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-01-29 17:46:47 +0100 |
| commit | ac84d1fb5a7293df4f75544eedf148ba0bb4ec21 (patch) | |
| tree | eec35601f6ce583520e3a41076023624ed183160 /src/core/mount.c | |
| parent | c9cf047362cd8e4530c10bc7c2d6db988452305d (diff) | |
core: make sure to always go through both SIGTERM and SIGKILL states of units
Given that we now have KillMode=mixed where SIGTERM might kill a smaller
set than SIGKILL we need to make sure to always go explicitly throught
the SIGKILL state to get the right end result.
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index 90da883826..45c0040bd1 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -854,8 +854,14 @@ static void mount_enter_signal(Mount *m, MountState state, MountResult f) { goto fail; mount_set_state(m, state); - } else if (state == MOUNT_REMOUNTING_SIGTERM || state == MOUNT_REMOUNTING_SIGKILL) + } else if (state == MOUNT_REMOUNTING_SIGTERM) + mount_enter_signal(m, MOUNT_REMOUNTING_SIGKILL, MOUNT_SUCCESS); + else if (state == MOUNT_REMOUNTING_SIGKILL) mount_enter_mounted(m, MOUNT_SUCCESS); + else if (state == MOUNT_MOUNTING_SIGTERM) + mount_enter_signal(m, MOUNT_MOUNTING_SIGKILL, MOUNT_SUCCESS); + else if (state == MOUNT_UNMOUNTING_SIGTERM) + mount_enter_signal(m, MOUNT_UNMOUNTING_SIGKILL, MOUNT_SUCCESS); else mount_enter_dead(m, MOUNT_SUCCESS); |