From ee23fe50a19eed94f1f6d870c3a73f4e52b8367c Mon Sep 17 00:00:00 2001 From: zhangsong234 Date: Tue, 30 Mar 2021 15:20:00 +0800 Subject: [PATCH 1/2] remove lxcfs-tools dependency for common use Signed-off-by: zhangsong234 (cherry picked from commit 2e41060717f0badd89f8544730f95f7f1f0e5137) --- ...xcfs-tools-dependency-for-common-use.patch | 32 +++++++++++++++++++ lxcfs.spec | 8 +++-- 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 0016-remove-lxcfs-tools-dependency-for-common-use.patch diff --git a/0016-remove-lxcfs-tools-dependency-for-common-use.patch b/0016-remove-lxcfs-tools-dependency-for-common-use.patch new file mode 100644 index 0000000..bda3d95 --- /dev/null +++ b/0016-remove-lxcfs-tools-dependency-for-common-use.patch @@ -0,0 +1,32 @@ +From 93a91769aaece5bcdac817443e31cd0a15a0952a Mon Sep 17 00:00:00 2001 +From: zhangsong234 +Date: Tue, 30 Mar 2021 15:14:24 +0800 +Subject: [PATCH] remove lxcfs-tools dependency for common use + +Signed-off-by: zhangsong234 +--- + config/init/systemd/lxcfs.service.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config/init/systemd/lxcfs.service.in b/config/init/systemd/lxcfs.service.in +index 3d763c6..bdaa2fa 100644 +--- a/config/init/systemd/lxcfs.service.in ++++ b/config/init/systemd/lxcfs.service.in +@@ -5,11 +5,11 @@ Before=lxc.service + Documentation=man:lxcfs(1) + + [Service] +-ExecStartPre=/usr/local/bin/lxcfs-tools prestart ++ExecStartPre=-/usr/local/bin/lxcfs-tools prestart + ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ +-ExecStartPost=/usr/local/bin/lxcfs-tools remount -a ++ExecStartPost=-/usr/local/bin/lxcfs-tools remount -a + KillMode=process +-ExecStop=/usr/local/bin/lxcfs-tools umount -a ++ExecStop=-/usr/local/bin/lxcfs-tools umount -a + ExecStopPost=-/bin/fusermount -u /var/lib/lxc/ + Delegate=yes + ExecReload=/bin/kill -USR1 $MAINPID +-- +1.8.3.1 + diff --git a/lxcfs.spec b/lxcfs.spec index 38082e5..c3594da 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -4,9 +4,9 @@ #Basic Information Name: lxcfs Version: 4.0.5 -Release: 3 +Release: 4 Summary: FUSE filesystem for LXC -License: Apache-2.0 +License: LGPL 2.1+ URL: http://linuxcontainers.org Source: https://linuxcontainers.org/downloads/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -25,6 +25,7 @@ Patch9012: 0012-lxcfs-proc_diskstats_read-func-obtain-data-from-blki.patch Patch9013: 0013-add-secure-compile-option-in-Makefile.patch Patch9014: 0014-fix-proc-diskstats-show-in-container.patch Patch9015: 0015-lxcfs-adapt-4.18-kernel.patch +Patch9016: 0016-remove-lxcfs-tools-dependency-for-common-use.patch #Dependency BuildRequires: autoconf automake libtool help2man @@ -84,6 +85,9 @@ fi %{_unitdir}/* %changelog +* Tue Mar 30 2021 zhangsong234 - 4.0.5-4 +- remove lxcfs-tools dependency for common use + * Mon Nov 30 2020 openEuler Buildteam - 4.0.5-2 - fix reinstall bug -- Gitee From ec98ac0f269e912075995dce07d89069ba0778bc Mon Sep 17 00:00:00 2001 From: zhangsong234 Date: Thu, 27 May 2021 10:37:20 +0800 Subject: [PATCH 2/2] proc_fuse: fix wait child process hang Signed-off-by: zhangsong234 (cherry picked from commit 10e833505b17877d08ee80cbb8f8cb7194a2d28f) --- ...roc_fuse-fix-wait-child-process-hang.patch | 30 +++++++++++++++++++ lxcfs.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0017-proc_fuse-fix-wait-child-process-hang.patch diff --git a/0017-proc_fuse-fix-wait-child-process-hang.patch b/0017-proc_fuse-fix-wait-child-process-hang.patch new file mode 100644 index 0000000..c55b766 --- /dev/null +++ b/0017-proc_fuse-fix-wait-child-process-hang.patch @@ -0,0 +1,30 @@ +From aa362b383ca5e79e03fd350867fb4f96a1335ae5 Mon Sep 17 00:00:00 2001 +From: zhangsong234 +Date: Thu, 27 May 2021 10:16:00 +0800 +Subject: [PATCH] proc_fuse: fix wait child process hang + +Signed-off-by: zhangsong234 +--- + src/proc_fuse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/proc_fuse.c b/src/proc_fuse.c +index 96eb9d7..82b32c1 100644 +--- a/src/proc_fuse.c ++++ b/src/proc_fuse.c +@@ -487,11 +487,11 @@ struct devinfo* container_dev_read(pid_t pid) { + dev_num = dev_stat.st_dev & (~0xf); + fprintf(stream, "sda %d end 0 ", dev_num); + fflush(stream); ++child_out: + fclose(stream); + exit(0); + } + +-child_out: + close(mypipe[1]); + stream = fdopen(mypipe[0], "r"); + if (stream == NULL) { +-- +2.27.0 + diff --git a/lxcfs.spec b/lxcfs.spec index c3594da..9a533ee 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -4,7 +4,7 @@ #Basic Information Name: lxcfs Version: 4.0.5 -Release: 4 +Release: 5 Summary: FUSE filesystem for LXC License: LGPL 2.1+ URL: http://linuxcontainers.org @@ -26,6 +26,7 @@ Patch9013: 0013-add-secure-compile-option-in-Makefile.patch Patch9014: 0014-fix-proc-diskstats-show-in-container.patch Patch9015: 0015-lxcfs-adapt-4.18-kernel.patch Patch9016: 0016-remove-lxcfs-tools-dependency-for-common-use.patch +Patch9017: 0017-proc_fuse-fix-wait-child-process-hang.patch #Dependency BuildRequires: autoconf automake libtool help2man @@ -85,6 +86,9 @@ fi %{_unitdir}/* %changelog +* Thu May 27 2021 zhangsong234 - 4.0.5-5 +- proc_fuse: fix wait child process hang + * Tue Mar 30 2021 zhangsong234 - 4.0.5-4 - remove lxcfs-tools dependency for common use -- Gitee