From d37fb98bbcf85115a03664437ae02aa95f6af4bc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 14 Oct 2010 00:49:53 +0200 Subject: [PATCH] shutdown: execute rescue kill only once --- src/shutdown.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shutdown.c b/src/shutdown.c index 3c9a53126..43165fefa 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -286,18 +286,18 @@ int main(int argc, char *argv[]) { if (need_umount || need_swapoff || need_loop_detach) { retries--; - if (retries <= FINALIZE_CRITICAL_ATTEMPTS) { + if (retries == FINALIZE_CRITICAL_ATTEMPTS) { log_warning("Approaching critical level to finalize filesystem and devices, try to kill all processes."); rescue_send_signal(SIGTERM); rescue_send_signal(SIGKILL); } if (retries > 0) - log_info("Action still required, %d tries left", retries); + log_info("Action still required, %d tries left.", retries); else { - log_error("Tried enough but still action required need_umount=%d, need_swapoff=%d, need_loop_detach=%d", need_umount, need_swapoff, need_loop_detach); - r = -EBUSY; - goto error; + log_error("Giving up. Actions left: Umount=%s, Swap off=%s, Loop detach=%s", + yes_no(need_umount), yes_no(need_swapoff), yes_no(need_loop_detach)); + break; } } } -- 2.30.2