commands_utils: fix lxc-wait

Closes: #3570
Fixes: 7792a5b60f79 ("commands: add additional check to lxc_cmd_sock_get_state()")
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/commands_utils.c b/src/lxc/commands_utils.c
index 2af722ca1224836598461d32111425439995a47a..cba8e9c10d46d4e15e9ea584c7ffb42cece4401c 100644 (file)
--- a/src/lxc/commands_utils.c
+++ b/src/lxc/commands_utils.c
@@ -62,7 +62,7 @@ int lxc_cmd_sock_get_state(const char *name, const char *lxcpath,
 
        ret = lxc_cmd_add_state_client(name, lxcpath, states, &state_client_fd);
        if (ret < 0)
-               return ret_errno(EINVAL);
+               return -errno;
 
        if (ret < MAX_STATE)
                return ret;

diff --git a/src/lxc/state.c b/src/lxc/state.c
index 28ab60c4b99d0ab0b750a41e9597c133a5ba1071..d131e2ebebb215e95abbb587766dbdf24f8e0098 100644 (file)
--- a/src/lxc/state.c
+++ b/src/lxc/state.c
@@ -100,10 +100,8 @@ int lxc_wait(const char *lxcname, const char *states, int timeout,
                if (state >= 0)
                        break;
 
-               if (errno != ECONNREFUSED) {
-                       SYSERROR("Failed to receive state from monitor");
-                       return -1;
-               }
+               if (errno != ECONNREFUSED)
+                       return log_error_errno(-1, errno, "Failed to receive state from monitor");
 
                if (timeout > 0)
                        timeout--;