]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
error.c: don't return error if container init signaled
authorSerge Hallyn <serge.hallyn@ubuntu.com>
Mon, 9 Sep 2013 20:35:52 +0000 (15:35 -0500)
committerStéphane Graber <stgraber@ubuntu.com>
Tue, 10 Sep 2013 22:19:20 +0000 (18:19 -0400)
We log that at INFO level in case it is needed.  However, in a modern
kernel a container which was shut down using 'shutdown' will always
have been signaled with SIGINT.  Making lxc-start return an error to
reflect that seems overkill.

It's *conceivable* that someone is depending on this behavior, so I'm
sending this out for anyone to NACK, but if I hear no complaints I'll
apply.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
src/lxc/error.c

index 15e6ab0bd688ba7f17e8eb5de8e2e98d943d45f6..46c34bbc413a605c15e761305f75e282ffad1b8c 100644 (file)
@@ -50,7 +50,6 @@ extern int  lxc_error_set_and_log(int pid, int status)
 
        if (WIFSIGNALED(status)) {
                int signal = WTERMSIG(status);
-               ret = ret + 128 + signal;
 
                INFO("child <%d> ended on signal (%d)", pid, signal);
        }