mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-13 10:45:45 +00:00
commands: allow waiting for all states
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
parent
20144819c4
commit
24b0bd9a80
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user