From 415dbd2e542e7a0f6b15350e1c5fd00dca54b91d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 26 Oct 2010 20:51:15 +0200 Subject: [PATCH] shutdown: properly handle sigtimedwait() timing out --- src/shutdown.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shutdown.c b/src/shutdown.c index bd4b69bbe..e8d250179 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -140,7 +140,8 @@ static int send_signal(int sign) { timespec_store(&ts, until - n); if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD) - log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); + if (errno != EAGAIN) + log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); } finish: @@ -189,7 +190,8 @@ static int rescue_send_signal(int sign) { timespec_store(&ts, until - n); if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD) - log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); + if (errno != EAGAIN) + log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); } finish: -- 2.30.2