just use origin loop if do not have io

Signed-off-by: haozi007 <liuhao27@huawei.com>
This commit is contained in:
haozi007 2021-09-17 08:21:13 +01:00
parent 313d866a34
commit 1ef014906b
3 changed files with 35 additions and 1 deletions

View File

@ -0,0 +1,26 @@
From 21aba903a2e0d744eb54a7737bc11585c2be9aa3 Mon Sep 17 00:00:00 2001
From: haozi007 <liuhao27@huawei.com>
Date: Fri, 17 Sep 2021 08:18:14 +0100
Subject: [PATCH] just use origin loop if do not have io
Signed-off-by: haozi007 <liuhao27@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
index e6e2170..52ea561 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -590,7 +590,7 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
}
#endif
- ret = isulad_safe_mainloop(&descr, -1);
+ ret = lxc_mainloop(&descr, -1);
close_prot_errno_disarm(descr.epfd);
if (ret < 0 || !handler->init_died)
goto out_mainloop_console;
--
2.20.1

View File

@ -1,4 +1,4 @@
%global _release 2021091701 %global _release 2021091702
Name: lxc Name: lxc
Version: 4.0.3 Version: 4.0.3
@ -36,6 +36,7 @@ Patch0025: 0025-get-cgroup-data-len-first-and-malloc-read-buff-by-le.patch
Patch0026: 0026-coredump-fix-coredump-when-cgroup-get-return-error.patch Patch0026: 0026-coredump-fix-coredump-when-cgroup-get-return-error.patch
Patch0027: 0027-add-help-for-new-arguments.patch Patch0027: 0027-add-help-for-new-arguments.patch
Patch0028: 0028-seccomp-init-and-destroy-notifier.cookie.patch Patch0028: 0028-seccomp-init-and-destroy-notifier.cookie.patch
Patch0029: 0029-just-use-origin-loop-if-do-not-have-io.patch
BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
@ -207,6 +208,12 @@ make check
%{_mandir}/*/man7/%{name}* %{_mandir}/*/man7/%{name}*
%changelog %changelog
* Fri Sep 17 2021 haozi007<liuhao27@huawei.com> - 4.0.3-2021091702
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:just use origin loop if do not have io
* Fri Sep 17 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.3-2021091701 * Fri Sep 17 2021 zhangxiaoyu <zhangxiaoyu58@huawei.com> - 4.0.3-2021091701
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

View File

@ -26,3 +26,4 @@
0026-coredump-fix-coredump-when-cgroup-get-return-error.patch 0026-coredump-fix-coredump-when-cgroup-get-return-error.patch
0027-add-help-for-new-arguments.patch 0027-add-help-for-new-arguments.patch
0028-seccomp-init-and-destroy-notifier.cookie.patch 0028-seccomp-init-and-destroy-notifier.cookie.patch
0029-just-use-origin-loop-if-do-not-have-io.patch