From fc11025a0ca88b1a1bb8fe7fb3928630a9302e4c Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 21 Nov 2017 20:42:28 +0100 Subject: [PATCH] commands: allow waiting for all states Signed-off-by: Christian Brauner --- src/lxc/commands.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/lxc/commands.c b/src/lxc/commands.c index 1fbefbf57..a6948b2f2 100644 --- a/src/lxc/commands.c +++ b/src/lxc/commands.c @@ -850,24 +850,6 @@ int lxc_cmd_add_state_client(const char *name, const char *lxcpath, return state; } - if ((state == STARTING) && !states[RUNNING] && !states[STOPPING] && !states[STOPPED]) { - TRACE("Container is in %s state and caller requested to be " - "informed about a previous state", lxc_state2str(state)); - return state; - } else if ((state == RUNNING) && !states[STOPPING] && !states[STOPPED]) { - TRACE("Container is in %s state and caller requested to be " - "informed about a previous state", lxc_state2str(state)); - return state; - } else if ((state == STOPPING) && !states[STOPPED]) { - TRACE("Container is in %s state and caller requested to be " - "informed about a previous state", lxc_state2str(state)); - return state; - } else if ((state == STOPPED) || (state == ABORTING)) { - TRACE("Container is in %s state and caller requested to be " - "informed about a previous state", lxc_state2str(state)); - return state; - } - ret = lxc_cmd(name, &cmd, &stopped, lxcpath, NULL); if (ret < 0) { ERROR("%s - Failed to execute command", strerror(errno)); @@ -877,7 +859,6 @@ int lxc_cmd_add_state_client(const char *name, const char *lxcpath, /* We should now be guaranteed to get an answer from the state sending * function. */ - if (cmd.rsp.ret < 0) { ERROR("Failed to receive socket fd"); return -1; -- 2.47.2