commands: allow waiting for all states

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 8998dc373f20bfb628c60961b1a4017a47cedbe1..4056fb7ac4df98acce27e44c63988a57a5585302 100644 (file)
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -914,24 +914,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));
@@ -941,7 +923,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;