[systemd-devel] [PATCH v2 3/3] nspawn: log a warning on failure from wait_for_terminate()

[Lennart Poettering]

On Sun, 29.06.14 20:18, Luke Shumaker (LukeShu at sbcglobal.net) wrote:

> This is at the suggestion of Djalal Harouni on the mailing list, and
> reflects the behavior of shared/util.c:wait_for_terminate_and_warn().

Commited all three, and made a minor simplification afterwards.

Thanks!

> ---
>  src/nspawn/nspawn.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
> index be0e6b5..8fb72d6 100644
> --- a/src/nspawn/nspawn.c
> +++ b/src/nspawn/nspawn.c
> @@ -2666,8 +2666,10 @@ static int wait_for_container(pid_t pid, ContainerStatus *container) {
>          siginfo_t status;
>  
>          r = wait_for_terminate(pid, &status);
> -        if (r < 0)
> +        if (r < 0) {
> +                log_warning("Failed to wait for container: %s", strerror(-r));
>                  return r;
> +        }
>  
>          switch (status.si_code) {
>          case CLD_EXITED:


Lennart

-- 
Lennart Poettering, Red Hat