2019-12-25 15:57:42 +08:00
|
|
|
From 68b20e1e3571bdaf1d454bf23e649474d5675dfd Mon Sep 17 00:00:00 2001
|
2019-09-30 11:03:07 -04:00
|
|
|
From: LiFeng <lifeng68@huawei.com>
|
|
|
|
|
Date: Sat, 19 Jan 2019 02:05:17 -0500
|
2019-12-25 15:57:42 +08:00
|
|
|
Subject: [PATCH 049/131] Add 100ms timeout for console epoll
|
2019-09-30 11:03:07 -04:00
|
|
|
|
|
|
|
|
add 100ms timeout for console epoll to avoid lose console
|
|
|
|
|
|
|
|
|
|
Signed-off-by: LiFeng <lifeng68@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
src/lxc/start.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/src/lxc/start.c b/src/lxc/start.c
|
2019-12-25 15:57:42 +08:00
|
|
|
index 7bbcb009..daf2af4d 100644
|
2019-09-30 11:03:07 -04:00
|
|
|
--- a/src/lxc/start.c
|
|
|
|
|
+++ b/src/lxc/start.c
|
|
|
|
|
@@ -643,7 +643,7 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
|
|
|
|
|
goto out_mainloop_console;
|
|
|
|
|
|
|
|
|
|
if (has_console)
|
|
|
|
|
- ret = lxc_mainloop(&descr_console, 0);
|
|
|
|
|
+ ret = lxc_mainloop(&descr_console, 100);
|
|
|
|
|
|
|
|
|
|
out_mainloop_console:
|
|
|
|
|
if (has_console) {
|
|
|
|
|
--
|
2019-12-25 15:57:42 +08:00
|
|
|
2.23.0
|
2019-09-30 11:03:07 -04:00
|
|
|
|
