fix multiple console for a container

src/lxc/commands.c

@@ -69,8 +69,8 @@ static int receive_answer(int sock, struct lxc_answer *answer)
 	return ret;
 }
 
-extern int lxc_command(const char *name, struct lxc_command *command,
-		       int *stopped)
+static int __lxc_command(const char *name, struct lxc_command *command,
+			 int *stopped, int stay_connected)
 {
 	int sock, ret = -1;
 	char path[sizeof(((struct sockaddr_un *)0)->sun_path)] = { 0 };
@@ -103,10 +103,25 @@ extern int lxc_command(const char *name, struct lxc_command *command,
 
 	ret = receive_answer(sock, &command->answer);
 out:
-	close(sock);
+	if (!stay_connected || ret < 0)
+		close(sock);
+
 	return ret;
 }
 
+extern int lxc_command(const char *name,
+		       struct lxc_command *command, int *stopped)
+{
+	return __lxc_command(name, command, stopped, 0);
+}
+
+extern int lxc_command_connected(const char *name,
+				 struct lxc_command *command, int *stopped)
+{
+	return __lxc_command(name, command, stopped, 1);
+}
+
+
 pid_t get_init_pid(const char *name)
 {
 	struct lxc_command command = {

src/lxc/commands.h

@@ -48,9 +48,13 @@ struct lxc_command {
 };
 
 extern pid_t get_init_pid(const char *name);
+
 extern int lxc_command(const char *name, struct lxc_command *command,
 			int *stopped);
 
+extern int lxc_command_connected(const char *name, struct lxc_command *command,
+				 int *stopped);
+
 struct lxc_epoll_descr;
 struct lxc_handler;
 

src/lxc/console.c

@@ -47,7 +47,7 @@ extern int lxc_console(const char *name, int ttynum, int *fd)
 		.request = { .type = LXC_COMMAND_TTY, .data = ttynum },
 	};
 
-	ret = lxc_command(name, &command, &stopped);
+	ret = lxc_command_connected(name, &command, &stopped);
 	if (ret < 0 && stopped) {
 		ERROR("'%s' is stopped", name);
 		return -1;