diff --git a/0001-confile-add-lxc.isulad.init.args-config-interface.patch b/0001-confile-add-lxc.isulad.init.args-config-interface.patch index e01d1f151c8abe6d3130984746e164f0f713fd4c..f50959dc82a02eb3b606251a6c3fc6270902d744 100644 --- a/0001-confile-add-lxc.isulad.init.args-config-interface.patch +++ b/0001-confile-add-lxc.isulad.init.args-config-interface.patch @@ -1,7 +1,7 @@ -From 0f644fdef13f66047b2b60a3d6dd31f8783a86ab Mon Sep 17 00:00:00 2001 +From fe3f5f02802c2447c7c7cc003b1f408c7360b1dc Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 10 Jan 2019 06:54:37 -0500 -Subject: [PATCH 001/138] confile: add lxc.isulad.init.args config interface +Subject: [PATCH 001/139] confile: add lxc.isulad.init.args config interface lxc.isulad.init.args config interface is used to specify the args for the container. diff --git a/0002-namespace-add-support-share-namespace-by-path.patch b/0002-namespace-add-support-share-namespace-by-path.patch index fc78ce86b8e2743a963783622d62362004ed364f..e1d9cf5604745b27ca33ee34132fcb46652189fc 100644 --- a/0002-namespace-add-support-share-namespace-by-path.patch +++ b/0002-namespace-add-support-share-namespace-by-path.patch @@ -1,7 +1,7 @@ -From 57c5e215695a3b4c4e3fa80776aee90e0542d980 Mon Sep 17 00:00:00 2001 +From 0c195b1b6493fbb036e3eb9218f6a173e16a2123 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 10 Jan 2019 08:42:19 -0500 -Subject: [PATCH 002/138] namespace: add support share namespace by path +Subject: [PATCH 002/139] namespace: add support share namespace by path Signed-off-by: LiFeng --- diff --git a/0003-confile-add-lxc.isulad.populate.device-interface.patch b/0003-confile-add-lxc.isulad.populate.device-interface.patch index 9037beba16adeb83d4355dd9c940b0500f402892..3f6b463e885466f003353a956db2fcb936195e6a 100644 --- a/0003-confile-add-lxc.isulad.populate.device-interface.patch +++ b/0003-confile-add-lxc.isulad.populate.device-interface.patch @@ -1,7 +1,7 @@ -From d1bb169f38282acf9ae38ef000c2f5c658b4f325 Mon Sep 17 00:00:00 2001 +From 444ad05515c41c41313a97a08e91cc4d9e890d9f Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 11 Jan 2019 01:51:25 -0500 -Subject: [PATCH 003/138] confile: add lxc.isulad.populate.device interface +Subject: [PATCH 003/139] confile: add lxc.isulad.populate.device interface Signed-off-by: LiFeng --- diff --git a/0004-support-isulad-fifo-log.patch b/0004-support-isulad-fifo-log.patch index 95272a01be6d3e8b9aae68ed47f654af7cdb419f..5e4a1d02e591905c7bc2af44378dfdf89cce3cf2 100644 --- a/0004-support-isulad-fifo-log.patch +++ b/0004-support-isulad-fifo-log.patch @@ -1,7 +1,7 @@ -From 88c0440da8e943d251cff194b8d1d8bb916a524a Mon Sep 17 00:00:00 2001 +From 28e96202dfe639add68c68fd31447031675fddbe Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 11 Jan 2019 16:11:34 +0800 -Subject: [PATCH 004/138] support isulad fifo log +Subject: [PATCH 004/139] support isulad fifo log support isulad fifo log in lxc3.0 diff --git a/0005-auto-mount-cgroup-sys-and-proc.patch b/0005-auto-mount-cgroup-sys-and-proc.patch index 019aab49281f7f8b87291d42fa1da2c927e9df9a..76c61151466827db678da17f7e7625eee5f453d1 100644 --- a/0005-auto-mount-cgroup-sys-and-proc.patch +++ b/0005-auto-mount-cgroup-sys-and-proc.patch @@ -1,7 +1,7 @@ -From a0cd5fd3be5a45b13d39316f371a3573a491ed13 Mon Sep 17 00:00:00 2001 +From 2f720e57a3982ca18e271ec96de68e10d6f6bc20 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 10 Jan 2019 20:40:19 +0800 -Subject: [PATCH 005/138] auto mount cgroup sys and proc +Subject: [PATCH 005/139] auto mount cgroup sys and proc Signed-off-by: LiFeng --- diff --git a/0006-conf.c-fix-bug-when-set-no-ro-mount-mount-propagatio.patch b/0006-conf.c-fix-bug-when-set-no-ro-mount-mount-propagatio.patch index 64a9c7453cc34f37deb4661b758d95edac6090e8..b46f5df4e4b3b1670ee0f4391f1ab3c9a79ea895 100644 --- a/0006-conf.c-fix-bug-when-set-no-ro-mount-mount-propagatio.patch +++ b/0006-conf.c-fix-bug-when-set-no-ro-mount-mount-propagatio.patch @@ -1,7 +1,7 @@ -From 5791056145d9d1885a5b17826f39a3c925168dd8 Mon Sep 17 00:00:00 2001 +From fc244b0d105bf7519bba11cbc1c1e65ff2b9eaaa Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 11 Jan 2019 16:55:01 +0800 -Subject: [PATCH 006/138] conf.c: fix bug when set no ro mount, mount +Subject: [PATCH 006/139] conf.c: fix bug when set no ro mount, mount propagation will be skipped Signed-off-by: LiFeng diff --git a/0007-use-isulad-log-format.patch b/0007-use-isulad-log-format.patch index 4246c4d5dea92369c88a11b611fc987d49e703b1..5d690bebe54923054fa98c0b5fe6694634ee81dd 100644 --- a/0007-use-isulad-log-format.patch +++ b/0007-use-isulad-log-format.patch @@ -1,7 +1,7 @@ -From 038a44d304a7ab1cea6bd87a82af2b5f56527ba5 Mon Sep 17 00:00:00 2001 +From 7195a22f6717a3f34d1c0fccedb4a015dba50eb8 Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 11 Jan 2019 17:00:48 +0800 -Subject: [PATCH 007/138] use isulad log format +Subject: [PATCH 007/139] use isulad log format use isulad log format diff --git a/0008-isulad-modify-exit-code-and-stop-signal.patch b/0008-isulad-modify-exit-code-and-stop-signal.patch index 9f39d954f31fad1ef2a504b1e331d6a470af9df0..882da8e8e2b831cede070a901d7cfb06c0faba87 100644 --- a/0008-isulad-modify-exit-code-and-stop-signal.patch +++ b/0008-isulad-modify-exit-code-and-stop-signal.patch @@ -1,7 +1,7 @@ -From 5d6aea523f0a89a1ef57c409de234c9b22b14eb4 Mon Sep 17 00:00:00 2001 +From 02f351d441398861416e8101d491b4cdd6b4988b Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 11 Jan 2019 17:44:53 +0800 -Subject: [PATCH 008/138] isulad: modify exit code and stop signal +Subject: [PATCH 008/139] isulad: modify exit code and stop signal 1. modify default stop signal and disable reboot by signal. 2. send '128 + signal' if container is killed by signal. diff --git a/0009-lxc_start-add-default-terminal-fifos.patch b/0009-lxc_start-add-default-terminal-fifos.patch index ac6f497077c3cc202ba2fd57cf6612263f01f1cc..ec26e320c91c074bbdf49da5fc9d700a0abd98a8 100644 --- a/0009-lxc_start-add-default-terminal-fifos.patch +++ b/0009-lxc_start-add-default-terminal-fifos.patch @@ -1,7 +1,7 @@ -From 88256f6a222a9e2fbaac73f66ffcd02a4f970864 Mon Sep 17 00:00:00 2001 +From d96fee01aeb6f95f5b017f5d8828e1994c549dc5 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 11 Jan 2019 21:52:11 -0500 -Subject: [PATCH 009/138] lxc_start: add default terminal fifos +Subject: [PATCH 009/139] lxc_start: add default terminal fifos Signed-off-by: LiFeng --- diff --git a/0010-Save-pid-ppid-info-into-file-for-isulad.patch b/0010-Save-pid-ppid-info-into-file-for-isulad.patch index df2af1d228ed11770f487b7faef0ffccd338d89d..76acabcbf5e593bb634556d26720128a0799815d 100644 --- a/0010-Save-pid-ppid-info-into-file-for-isulad.patch +++ b/0010-Save-pid-ppid-info-into-file-for-isulad.patch @@ -1,7 +1,7 @@ -From 891845a031814911a72b8eed95c4d44426b7e69c Mon Sep 17 00:00:00 2001 +From 10aa38b436cde63126d70b943fd6533b95e89673 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 11 Jan 2019 22:53:56 -0500 -Subject: [PATCH 010/138] Save pid/ppid info into file for isulad +Subject: [PATCH 010/139] Save pid/ppid info into file for isulad Signed-off-by: LiFeng --- diff --git a/0011-Add-exit-FIFO-to-monitor-state-of-lxc-monitor.patch b/0011-Add-exit-FIFO-to-monitor-state-of-lxc-monitor.patch index 0ee612819804ccbef218723c639fd0943ce66c98..012d9c50905043463ec2a75e86f9eff19909da5f 100644 --- a/0011-Add-exit-FIFO-to-monitor-state-of-lxc-monitor.patch +++ b/0011-Add-exit-FIFO-to-monitor-state-of-lxc-monitor.patch @@ -1,7 +1,7 @@ -From 0ebd912b689734dce70226495a5ac35893dda615 Mon Sep 17 00:00:00 2001 +From 229ca2972fd7baf608873432cd4065d5f72a895d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 12 Jan 2019 02:07:15 -0500 -Subject: [PATCH 011/138] Add exit FIFO to monitor state of [lxc monitor] +Subject: [PATCH 011/139] Add exit FIFO to monitor state of [lxc monitor] Signed-off-by: LiFeng --- diff --git a/0012-Init-fifos-in-lxc_attach_terminal.patch b/0012-Init-fifos-in-lxc_attach_terminal.patch index 0d76169bd464d87ff1f8dfb449ff14019307b159..18ee18f4e645c7fa3942acbb2d954d79888d8493 100644 --- a/0012-Init-fifos-in-lxc_attach_terminal.patch +++ b/0012-Init-fifos-in-lxc_attach_terminal.patch @@ -1,7 +1,7 @@ -From 2cecb3a3476d62937a123d59bbeab5aafa7e5c39 Mon Sep 17 00:00:00 2001 +From 7c5602c6601ed2af22b20958b738c4723221e606 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 12 Jan 2019 03:23:53 -0500 -Subject: [PATCH 012/138] Init fifos in lxc_attach_terminal +Subject: [PATCH 012/139] Init fifos in lxc_attach_terminal Signed-off-by: LiFeng --- diff --git a/0013-isulad-set-env-home-in-container.patch b/0013-isulad-set-env-home-in-container.patch index 5d3772fb92c3fee13e339d9eef7945537431eba2..7b5ee4b79c6a3f648f58a78b880729e79706d208 100644 --- a/0013-isulad-set-env-home-in-container.patch +++ b/0013-isulad-set-env-home-in-container.patch @@ -1,7 +1,7 @@ -From 9b0dd80f08b4a21c9ab2ff6a7fd5f74c281825bb Mon Sep 17 00:00:00 2001 +From a5846da29496fa7fbc540fd277f89860eec38d94 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 12 Jan 2019 14:42:27 +0800 -Subject: [PATCH 013/138] isulad: set env home in container +Subject: [PATCH 013/139] isulad: set env home in container Signed-off-by: LiFeng --- diff --git a/0014-support-rotate-for-container-log-file.patch b/0014-support-rotate-for-container-log-file.patch index 73c51c2a48003e78330cd61e86d8b5e176c4f2a4..fdcf5c507473a7d08b138a20eff2bd9bf96e26c6 100644 --- a/0014-support-rotate-for-container-log-file.patch +++ b/0014-support-rotate-for-container-log-file.patch @@ -1,7 +1,7 @@ -From 525ebf75258bcc7ea9edeeb726c9b3363bb80d80 Mon Sep 17 00:00:00 2001 +From 90727142a0c6ac463f79e5eb55038e88ce919c23 Mon Sep 17 00:00:00 2001 From: liuhao Date: Sat, 12 Jan 2019 15:29:56 +0800 -Subject: [PATCH 014/138] support rotate for container log file +Subject: [PATCH 014/139] support rotate for container log file support rotate for container log file diff --git a/0015-fix-high-gcc-compile-bug.patch b/0015-fix-high-gcc-compile-bug.patch index baa8aa3b8e5eb2a09cfd580175d5c17815d9f747..937ac366837863db47287277bd669bf70e394201 100644 --- a/0015-fix-high-gcc-compile-bug.patch +++ b/0015-fix-high-gcc-compile-bug.patch @@ -1,7 +1,7 @@ -From b5365278bc22ab4798d5ebd7bdb7c9d110b60124 Mon Sep 17 00:00:00 2001 +From 8c95d80b70033abcedfecdb6220926a824266b69 Mon Sep 17 00:00:00 2001 From: liuhao Date: Sat, 12 Jan 2019 16:28:41 +0800 -Subject: [PATCH 015/138] fix high gcc compile bug +Subject: [PATCH 015/139] fix high gcc compile bug fix high gcc compile bug diff --git a/0016-add-masked-paths-and-ro-paths.patch b/0016-add-masked-paths-and-ro-paths.patch index f18f36191417c3682aac781693d25ac3cfca6273..3f9f4de5412c50b69339ad78281a589e3751887c 100644 --- a/0016-add-masked-paths-and-ro-paths.patch +++ b/0016-add-masked-paths-and-ro-paths.patch @@ -1,7 +1,7 @@ -From e1a53f3d458be5b8c9b9301a9e6280a2c64bf00b Mon Sep 17 00:00:00 2001 +From ac67190a1318bf9d7ed6c0e16834849137bcaabd Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 12 Jan 2019 15:55:52 +0800 -Subject: [PATCH 016/138] add masked paths and ro paths +Subject: [PATCH 016/139] add masked paths and ro paths Signed-off-by: LiFeng --- diff --git a/0017-isulad-check-cgroup-cpu.shares-after-setted.patch b/0017-isulad-check-cgroup-cpu.shares-after-setted.patch index fcb9616698786f5675138f11e4aced10c4a69400..3ec4f4afc2d15d4561f438980a8b0d63d391eab8 100644 --- a/0017-isulad-check-cgroup-cpu.shares-after-setted.patch +++ b/0017-isulad-check-cgroup-cpu.shares-after-setted.patch @@ -1,7 +1,7 @@ -From 21741c37e812d677d3adf3c721c4343e04a81c65 Mon Sep 17 00:00:00 2001 +From 14804433edf6c4d5732d109181f6ca1b0c19b0df Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 11:03:03 +0800 -Subject: [PATCH 017/138] isulad: check cgroup cpu.shares after setted +Subject: [PATCH 017/139] isulad: check cgroup cpu.shares after setted Signed-off-by: LiFeng --- diff --git a/0018-lxc-attach-add-support-terminal-fifos.patch b/0018-lxc-attach-add-support-terminal-fifos.patch index 9621b51089fe687b5bed1ea27d2a343bf71b9dc0..f6215e3832b7de49620704c7b7f9b707ed882da1 100644 --- a/0018-lxc-attach-add-support-terminal-fifos.patch +++ b/0018-lxc-attach-add-support-terminal-fifos.patch @@ -1,7 +1,7 @@ -From de7a18f60c2339c6b962caf7f0ee967993d7e579 Mon Sep 17 00:00:00 2001 +From 0f0b1f6315e95c958a56c5409b006efeabbf3d30 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 14 Jan 2019 02:18:26 -0500 -Subject: [PATCH 018/138] lxc-attach: add support terminal fifos +Subject: [PATCH 018/139] lxc-attach: add support terminal fifos 1. support terminal fifos to redirect terminal 2. support lxc-attach run in background diff --git a/0019-remount-cgroup-readonly-and-make-soft-link-of-subcgr.patch b/0019-remount-cgroup-readonly-and-make-soft-link-of-subcgr.patch index f50119143d1946330a560f2ffc56ed8cc6ca6503..8a5549b6b1b66cba782f24a103747930ed52bb52 100644 --- a/0019-remount-cgroup-readonly-and-make-soft-link-of-subcgr.patch +++ b/0019-remount-cgroup-readonly-and-make-soft-link-of-subcgr.patch @@ -1,7 +1,7 @@ -From bf718c9619dc27da6c196f71d1552855b8436cc0 Mon Sep 17 00:00:00 2001 +From 0e128190d1080af6a472619248a3f40e313759c6 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 13:51:01 +0800 -Subject: [PATCH 019/138] remount cgroup readonly and make soft link of +Subject: [PATCH 019/139] remount cgroup readonly and make soft link of subcgroup Signed-off-by: LiFeng diff --git a/0020-fix-log-error-when-symlink-subcgroup.patch b/0020-fix-log-error-when-symlink-subcgroup.patch index c0c014fd672664d06a8f9dbf649b9cf23808686d..690fe6044275fceda0ed3d8269334d1373fca76d 100644 --- a/0020-fix-log-error-when-symlink-subcgroup.patch +++ b/0020-fix-log-error-when-symlink-subcgroup.patch @@ -1,7 +1,7 @@ -From c3be42e31402b3361f15d6a6d25a39f36cb58234 Mon Sep 17 00:00:00 2001 +From ff9ed21b59f16aae369895612a9036f112daa035 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 15:33:12 +0800 -Subject: [PATCH 020/138] fix log error when symlink subcgroup +Subject: [PATCH 020/139] fix log error when symlink subcgroup Signed-off-by: LiFeng --- diff --git a/0021-lxc-attch-add-error-message.patch b/0021-lxc-attch-add-error-message.patch index d52264f4c9ce92d5f34cdfcd968061d74033e95e..aaab2f09c8e32a00c925254ff73c2747f8e282c1 100644 --- a/0021-lxc-attch-add-error-message.patch +++ b/0021-lxc-attch-add-error-message.patch @@ -1,7 +1,7 @@ -From 1c8e603aed10f387d6f74b51551c76c0154e1ad5 Mon Sep 17 00:00:00 2001 +From 6cdbeff1ad844ff52863a6e1488ed928f1c4fbb6 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 14 Jan 2019 04:29:40 -0500 -Subject: [PATCH 021/138] lxc-attch: add error message +Subject: [PATCH 021/139] lxc-attch: add error message Signed-off-by: LiFeng --- diff --git a/0022-support-rootfs-mount-propagation.patch b/0022-support-rootfs-mount-propagation.patch index 2358e8665db5e0fa805cfe6ee2f4a3160ed9b789..287965afe4b16673053c0a716e5f5f41401e3e5b 100644 --- a/0022-support-rootfs-mount-propagation.patch +++ b/0022-support-rootfs-mount-propagation.patch @@ -1,7 +1,7 @@ -From 5748a52d562b6a72f958a632a8ab8bd9b0157e11 Mon Sep 17 00:00:00 2001 +From 20ff2957e4a3d49604c4fa29dac7b752746307a6 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 17:02:02 +0800 -Subject: [PATCH 022/138] support rootfs mount propagation +Subject: [PATCH 022/139] support rootfs mount propagation Signed-off-by: LiFeng --- diff --git a/0023-attach.c-change-uid-and-gid-from-lxc-container-confi.patch b/0023-attach.c-change-uid-and-gid-from-lxc-container-confi.patch index db5c0618349ca0c9478351d416c55c6f150dc438..c361f1dff87cf6b8b742b99d6ae3124944eeea90 100644 --- a/0023-attach.c-change-uid-and-gid-from-lxc-container-confi.patch +++ b/0023-attach.c-change-uid-and-gid-from-lxc-container-confi.patch @@ -1,7 +1,7 @@ -From 166964c25070bfb6055d380cca6b52782d097826 Mon Sep 17 00:00:00 2001 +From e07440f08f8e6f3e572a5159b004db8cb4a8db7b Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 17:09:57 +0800 -Subject: [PATCH 023/138] attach.c: change uid and gid from lxc container +Subject: [PATCH 023/139] attach.c: change uid and gid from lxc container config Signed-off-by: LiFeng diff --git a/0024-isulad-support-symlink-in-mount-entry-and-not-permit.patch b/0024-isulad-support-symlink-in-mount-entry-and-not-permit.patch index 9147ec558147927c1e0f3924e9c33b8ab1d93c52..c320c4f719732797dd87e39d248b5443ac5d2a07 100644 --- a/0024-isulad-support-symlink-in-mount-entry-and-not-permit.patch +++ b/0024-isulad-support-symlink-in-mount-entry-and-not-permit.patch @@ -1,7 +1,7 @@ -From 6e84696ab1628a9eb52ba2855bc39fb4ffd908b8 Mon Sep 17 00:00:00 2001 +From c008838abc34819705f1b2ad51b24b5d7bbd629c Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 20:12:06 +0800 -Subject: [PATCH 024/138] isulad: support symlink in mount entry, and not +Subject: [PATCH 024/139] isulad: support symlink in mount entry, and not permit mount to /proc Signed-off-by: LiFeng diff --git a/0025-support-oci-hooks.patch b/0025-support-oci-hooks.patch index acd06af47ca786c26921e735341df55c4dba8c98..4f2923544e11be692a7d5437017e0adfe3ba50c1 100644 --- a/0025-support-oci-hooks.patch +++ b/0025-support-oci-hooks.patch @@ -1,7 +1,7 @@ -From 6d039fb81856965a4aed6bb29c1d14f958245cde Mon Sep 17 00:00:00 2001 +From 84c36bf2aa1aaee87352b711df495fdc0bbf6f55 Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 14 Jan 2019 17:47:17 +0800 -Subject: [PATCH 025/138] support oci hooks +Subject: [PATCH 025/139] support oci hooks support oci hooks diff --git a/0026-remove-filelock-and-do-not-destroy-directory-when-de.patch b/0026-remove-filelock-and-do-not-destroy-directory-when-de.patch index 31115dcc03e71a51cbd8a501cc5e0c27d497ba4e..f1a24e29c899b71e0258423cc6490f7eb9af960d 100644 --- a/0026-remove-filelock-and-do-not-destroy-directory-when-de.patch +++ b/0026-remove-filelock-and-do-not-destroy-directory-when-de.patch @@ -1,7 +1,7 @@ -From 654c22d0f010187a98d77cf68cc8c0d259f09587 Mon Sep 17 00:00:00 2001 +From ae243f820c25655931a1c1c79662ab9852fd4781 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 21:13:00 +0800 -Subject: [PATCH 026/138] remove filelock and do not destroy directory when +Subject: [PATCH 026/139] remove filelock and do not destroy directory when destroy container Signed-off-by: LiFeng diff --git a/0027-fix-bug-of-memory-leak.patch b/0027-fix-bug-of-memory-leak.patch index 42c50d0a9e74c17c7e9e4ba97452acebf6dcbfed..ca5f854305237ad7b65627159b9ca4a231ddd346 100644 --- a/0027-fix-bug-of-memory-leak.patch +++ b/0027-fix-bug-of-memory-leak.patch @@ -1,7 +1,7 @@ -From 44f1f43ed02453951dd974bc3cc17ee364476894 Mon Sep 17 00:00:00 2001 +From e430c3656032d2f112b7ec7eb99e07f05c300e8b Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 21:24:25 +0800 -Subject: [PATCH 027/138] fix bug of memory leak +Subject: [PATCH 027/139] fix bug of memory leak Signed-off-by: LiFeng --- diff --git a/0028-support-rootfs-for-container.patch b/0028-support-rootfs-for-container.patch index 0126be6610b5a6a56bf159fd38f54b06fedc005e..3d3db0d824080dacfd061479ca1ddf6679248920 100644 --- a/0028-support-rootfs-for-container.patch +++ b/0028-support-rootfs-for-container.patch @@ -1,7 +1,7 @@ -From af616876267279ffc89cd86744ba327e8c5c3d83 Mon Sep 17 00:00:00 2001 +From 4081310adbdf6b3baf13c5f8c40da2a01c7950e4 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 09:45:44 +0800 -Subject: [PATCH 028/138] support rootfs / for container +Subject: [PATCH 028/139] support rootfs / for container Signed-off-by: LiFeng --- diff --git a/0029-add-start-timeout-to-limit-start-time.patch b/0029-add-start-timeout-to-limit-start-time.patch index ecbbb6c2be28904c8da91b4ec3a8cb53c34c578b..82b5e425308ce17edb06a3e4527bdeb9b39da90e 100644 --- a/0029-add-start-timeout-to-limit-start-time.patch +++ b/0029-add-start-timeout-to-limit-start-time.patch @@ -1,7 +1,7 @@ -From 384d6f6e29e2c8e46db765382fa3e1f94c9d0a4e Mon Sep 17 00:00:00 2001 +From 44e451ba9b7959a5e55dfe5213285da3c4e44290 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 14 Jan 2019 21:38:07 -0500 -Subject: [PATCH 029/138] add start timeout to limit start time +Subject: [PATCH 029/139] add start timeout to limit start time Signed-off-by: LiFeng --- diff --git a/0030-support-block-device-as-rootfs.patch b/0030-support-block-device-as-rootfs.patch index bed69d013001d95683f77340a9be92fac3d76727..8520c127243100197753a18753f074e6b552899c 100644 --- a/0030-support-block-device-as-rootfs.patch +++ b/0030-support-block-device-as-rootfs.patch @@ -1,7 +1,7 @@ -From 0a4c408e992b1431316a1e743f4109f1b8a0a837 Mon Sep 17 00:00:00 2001 +From d56b1478fb6cad6a7430ffb3444b86787201a565 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 16:00:30 +0800 -Subject: [PATCH 030/138] support block device as rootfs +Subject: [PATCH 030/139] support block device as rootfs Signed-off-by: LiFeng --- diff --git a/0031-clean-add-clean-resources-api.patch b/0031-clean-add-clean-resources-api.patch index 8807002b1e5f13b98169d102dda8478a068ebae3..ef11eb1226ebc8ffe2c5879cef543e8d8ebfc800 100644 --- a/0031-clean-add-clean-resources-api.patch +++ b/0031-clean-add-clean-resources-api.patch @@ -1,7 +1,7 @@ -From 218fd1ad5b650ddb53e3b89189e6f35b10bc59d3 Mon Sep 17 00:00:00 2001 +From adfe5a04dabc871fb5cf3d4b505057ce8da02480 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 04:20:57 -0500 -Subject: [PATCH 031/138] clean: add clean resources api +Subject: [PATCH 031/139] clean: add clean resources api Signed-off-by: LiFeng --- diff --git a/0032-Drop-all-caps-when-cap.keep-ISULAD_KEEP_NONE.patch b/0032-Drop-all-caps-when-cap.keep-ISULAD_KEEP_NONE.patch index f39bd5963a802afab9e8b5c5a0b17f46fe0f7493..41350df21bba080cdd06a32f0b6aa24d881cc99c 100644 --- a/0032-Drop-all-caps-when-cap.keep-ISULAD_KEEP_NONE.patch +++ b/0032-Drop-all-caps-when-cap.keep-ISULAD_KEEP_NONE.patch @@ -1,7 +1,7 @@ -From d81dd5eca326f5173b89fbad3e419f7e623ccaea Mon Sep 17 00:00:00 2001 +From eaa99ec61f64d47443bc427ccd5b266bc9bb1ab6 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 05:39:39 -0500 -Subject: [PATCH 032/138] Drop all caps when cap.keep=ISULAD_KEEP_NONE +Subject: [PATCH 032/139] Drop all caps when cap.keep=ISULAD_KEEP_NONE Signed-off-by: LiFeng --- diff --git a/0033-support-mount-squashfs-in-mount-entry.patch b/0033-support-mount-squashfs-in-mount-entry.patch index 997d3b2f5b48d35afb135ba98166dd1efc83eed2..a872a5c67fa6ccba53f1d2b487fa0f0cbed84539 100644 --- a/0033-support-mount-squashfs-in-mount-entry.patch +++ b/0033-support-mount-squashfs-in-mount-entry.patch @@ -1,7 +1,7 @@ -From 3e5a9c9672e31e4f97c111d2c30424b2c203824f Mon Sep 17 00:00:00 2001 +From af999d8da16a36ff541d27d84d40bcf97f62e581 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 19:54:13 +0800 -Subject: [PATCH 033/138] support mount squashfs in mount entry +Subject: [PATCH 033/139] support mount squashfs in mount entry Signed-off-by: LiFeng --- diff --git a/0034-some-small-bugfix.patch b/0034-some-small-bugfix.patch index 6f2e8c62af2abbdbad8dafe73fcadf735a12df32..5056d7b5a68c5aba7617f0a2cda74664a16750ac 100644 --- a/0034-some-small-bugfix.patch +++ b/0034-some-small-bugfix.patch @@ -1,7 +1,7 @@ -From 0c156740697d390dc68c693b4b317a1e4bf77774 Mon Sep 17 00:00:00 2001 +From 44dc712ff6f6ed02c4fb50829967b21497d5e3e1 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 20:39:11 +0800 -Subject: [PATCH 034/138] some small bugfix +Subject: [PATCH 034/139] some small bugfix 1. support new container without load config to save time 2. try to create workdir if not exist diff --git a/0035-lxc-fixup-builds-with-newer-glibc.patch b/0035-lxc-fixup-builds-with-newer-glibc.patch index b28da23c2b14fe550353835029a2ff9a57af3211..7f2ffac233cb5ab026d9b0808c45472e487e4297 100644 --- a/0035-lxc-fixup-builds-with-newer-glibc.patch +++ b/0035-lxc-fixup-builds-with-newer-glibc.patch @@ -1,7 +1,7 @@ -From f89900e2e45d8e94cd4576b5e1e7a7b3cca3b0a9 Mon Sep 17 00:00:00 2001 +From 8e3399baf65cdfc8383b5c387f6b05a8c8944435 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 16 Jan 2019 20:53:25 +0800 -Subject: [PATCH 035/138] lxc: fixup builds with newer glibc +Subject: [PATCH 035/139] lxc: fixup builds with newer glibc Signed-off-by: LiFeng --- diff --git a/0036-drop_caps-add-drop-caps-of-current-process.patch b/0036-drop_caps-add-drop-caps-of-current-process.patch index 3df3c527d8282baa5eff8c367592a653a42b672c..a0c8303fe34cbe3d83768a12a24e92bbefc5d55f 100644 --- a/0036-drop_caps-add-drop-caps-of-current-process.patch +++ b/0036-drop_caps-add-drop-caps-of-current-process.patch @@ -1,7 +1,7 @@ -From eb12d34669676227b6973d7d2aa8a1d1ee595d79 Mon Sep 17 00:00:00 2001 +From 2e7e54c3c6c76637ed095f349d1a5f28c60446c5 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 22:55:06 -0500 -Subject: [PATCH 036/138] drop_caps: add drop caps of current process +Subject: [PATCH 036/139] drop_caps: add drop caps of current process Signed-off-by: LiFeng --- diff --git a/0037-restore-default-signal-handlers-and-set-umask-0027.patch b/0037-restore-default-signal-handlers-and-set-umask-0027.patch index 963f9f57edac3774738fcdcdae6d43b18c728c1a..69fe97a24f3f9164ea6f34230b4e60e355817726 100644 --- a/0037-restore-default-signal-handlers-and-set-umask-0027.patch +++ b/0037-restore-default-signal-handlers-and-set-umask-0027.patch @@ -1,7 +1,7 @@ -From f4a12bc311b3c3a9710948fd65ed7a7addbe183d Mon Sep 17 00:00:00 2001 +From 27f8123c3c4133c26bf1ef3ddec1be9e8bcd7119 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 23:14:14 -0500 -Subject: [PATCH 037/138] restore default signal handlers and set umask 0027 +Subject: [PATCH 037/139] restore default signal handlers and set umask 0027 Signed-off-by: LiFeng --- diff --git a/0038-make-the-given-terminal-as-controlling-terminal.patch b/0038-make-the-given-terminal-as-controlling-terminal.patch index 88a2466a63d2413c83bbe6f491756b9b7a45270c..151c15533eaa03f7fb3d86fd5408c1fe569be071 100644 --- a/0038-make-the-given-terminal-as-controlling-terminal.patch +++ b/0038-make-the-given-terminal-as-controlling-terminal.patch @@ -1,7 +1,7 @@ -From 28a1cd4ca1f09ad2179954cf210c2a0e4deae47e Mon Sep 17 00:00:00 2001 +From 00b977726fdcf2bbc5e44275db4c7b68ef8fa549 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 23:24:21 -0500 -Subject: [PATCH 038/138] make the given terminal as controlling terminal +Subject: [PATCH 038/139] make the given terminal as controlling terminal Avoid warning when start cmd /bin/sh : sh: cannot set terminal process group (-1): Inappropriate ioctl for device diff --git a/0039-print-error-message-when-container-start-failed.patch b/0039-print-error-message-when-container-start-failed.patch index 5ef6933cac0aff8b826a3f57574c11caf8702fc6..f14728e0add3765eddf4ada5d36a555b5cba2380 100644 --- a/0039-print-error-message-when-container-start-failed.patch +++ b/0039-print-error-message-when-container-start-failed.patch @@ -1,7 +1,7 @@ -From 0dc9bee69873493576be01fe001e17211b46ad87 Mon Sep 17 00:00:00 2001 +From e26b106534c01e94cb944da3dfcc75226ca03ee6 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 16 Jan 2019 14:38:38 +0800 -Subject: [PATCH 039/138] print error message when container start failed +Subject: [PATCH 039/139] print error message when container start failed Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0040-add-timeout-200ms-for-cmds-send-to-lxc-monitor.patch b/0040-add-timeout-200ms-for-cmds-send-to-lxc-monitor.patch index 59970d1e58db06a71c74934a591d5d837d628fad..54e393afe36c43af69a2f773cd72ccaa2e7cde94 100644 --- a/0040-add-timeout-200ms-for-cmds-send-to-lxc-monitor.patch +++ b/0040-add-timeout-200ms-for-cmds-send-to-lxc-monitor.patch @@ -1,7 +1,7 @@ -From bbd3eefaa71e17113a05268ad14707b8cee52bd1 Mon Sep 17 00:00:00 2001 +From 3697ed8dd6eb04d4664c8c56ee4e0e507db9c58d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 16 Jan 2019 02:22:13 -0500 -Subject: [PATCH 040/138] add timeout(200ms) for cmds send to [lxc monitor] +Subject: [PATCH 040/139] add timeout(200ms) for cmds send to [lxc monitor] Signed-off-by: LiFeng --- diff --git a/0041-return-1-when-_lxc_start-fails.patch b/0041-return-1-when-_lxc_start-fails.patch index c7dba0b17af8e0e0409f50e3db022ad2bbf30444..a54d25c21669f35ae53512ee1e16f1216ef6acb5 100644 --- a/0041-return-1-when-_lxc_start-fails.patch +++ b/0041-return-1-when-_lxc_start-fails.patch @@ -1,7 +1,7 @@ -From 5d0b2b47921f1e2c5120dabb9b8916b2abce023b Mon Sep 17 00:00:00 2001 +From b5b68b12ddaac8b39fcc4f621786e9ad6a271bd2 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 16 Jan 2019 05:53:36 -0500 -Subject: [PATCH 041/138] return -1 when _lxc_start fails +Subject: [PATCH 041/139] return -1 when _lxc_start fails Signed-off-by: LiFeng --- diff --git a/0042-lxc-seccomp-adopt-to-lxc3.0.patch b/0042-lxc-seccomp-adopt-to-lxc3.0.patch index 630cee603794d24ac68e2aaf0d0e4e34b6f92769..b0e35e53e9d6eec703b649601c1857b2650768eb 100644 --- a/0042-lxc-seccomp-adopt-to-lxc3.0.patch +++ b/0042-lxc-seccomp-adopt-to-lxc3.0.patch @@ -1,7 +1,7 @@ -From 264bfe855295416c66f9c149a0dcb93e56492011 Mon Sep 17 00:00:00 2001 +From 666174f112d1f6f765f6755e6f1ed4d3f8ca9055 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 17 Jan 2019 03:09:00 +0800 -Subject: [PATCH 042/138] lxc: seccomp adopt to lxc3.0 +Subject: [PATCH 042/139] lxc: seccomp adopt to lxc3.0 Signed-off-by: LiFeng --- diff --git a/0043-check-null-pointer-of-handler-to-fix-coredump-of-att.patch b/0043-check-null-pointer-of-handler-to-fix-coredump-of-att.patch index baeb67c8e4af16436296a22b061a070d480b427e..8e7d9adf6da216acc37371faae6d143592a0039e 100644 --- a/0043-check-null-pointer-of-handler-to-fix-coredump-of-att.patch +++ b/0043-check-null-pointer-of-handler-to-fix-coredump-of-att.patch @@ -1,7 +1,7 @@ -From ff77c9eb552544103add1f52f0534831642aaa2b Mon Sep 17 00:00:00 2001 +From d6893f5b376992b0b715a0b46c660c78144c1203 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 17 Jan 2019 10:19:37 +0800 -Subject: [PATCH 043/138] check null pointer of handler to fix coredump of +Subject: [PATCH 043/139] check null pointer of handler to fix coredump of attach Signed-off-by: tanyifeng diff --git a/0044-support-space-in-volume-mount-and-env.patch b/0044-support-space-in-volume-mount-and-env.patch index ecd6ba9bc2d3044c749f3d2029b8998f93b1f0ac..a706896ca5ac3e3ba0af8ed9b6a3a114794bde40 100644 --- a/0044-support-space-in-volume-mount-and-env.patch +++ b/0044-support-space-in-volume-mount-and-env.patch @@ -1,7 +1,7 @@ -From 3744b844951dff491d0bc4c5381790880d5d2199 Mon Sep 17 00:00:00 2001 +From 37e6f7c4ffb31290322791d972f4ab8e0fa34dcc Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 17 Jan 2019 10:18:23 +0800 -Subject: [PATCH 044/138] support space in --volume, --mount and --env +Subject: [PATCH 044/139] support space in --volume, --mount and --env Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0045-add_terminal_fifos-Add-terminal-fifos-dynamically.patch b/0045-add_terminal_fifos-Add-terminal-fifos-dynamically.patch index 8a20f710d7acc09de95a8b398312d123d5f2ce41..625c87e5666626811a6137e27b78c78345edc137 100644 --- a/0045-add_terminal_fifos-Add-terminal-fifos-dynamically.patch +++ b/0045-add_terminal_fifos-Add-terminal-fifos-dynamically.patch @@ -1,7 +1,7 @@ -From 1b1e83d187893f2e61c8952887d24b5afb949c77 Mon Sep 17 00:00:00 2001 +From 00789ddaf32704bbb848c63eb69c2b299c2d3471 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 17 Jan 2019 02:18:14 -0500 -Subject: [PATCH 045/138] add_terminal_fifos: Add terminal fifos dynamically +Subject: [PATCH 045/139] add_terminal_fifos: Add terminal fifos dynamically Signed-off-by: LiFeng --- diff --git a/0046-Do-not-test-cgroup-writeable.patch b/0046-Do-not-test-cgroup-writeable.patch index 105c0db1888183995af9eb4b88b74ff2fce16cd3..894bd7fe8516ab6ad76ce005ee972c691f73c59a 100644 --- a/0046-Do-not-test-cgroup-writeable.patch +++ b/0046-Do-not-test-cgroup-writeable.patch @@ -1,7 +1,7 @@ -From 0a353f7e5bc5e8f03f2a2654d51eb48c752a22ea Mon Sep 17 00:00:00 2001 +From ef7488f89bbdc933e2a84744092150939bef7c4c Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 17 Jan 2019 03:49:16 -0500 -Subject: [PATCH 046/138] Do not test cgroup writeable +Subject: [PATCH 046/139] Do not test cgroup writeable If we run isulad in docker without cgroup namespace, the base_cgroup will be docker/XXX.., mountpoint+base_cgroup may be not exist diff --git a/0047-Fix-memory-leak-in-lxc_global_config_value.patch b/0047-Fix-memory-leak-in-lxc_global_config_value.patch index d7be391cdc083c3a253107340445ffcbd8fca79d..229260e9ac0ba1c8f28f0cc5a2f3ec55fb070610 100644 --- a/0047-Fix-memory-leak-in-lxc_global_config_value.patch +++ b/0047-Fix-memory-leak-in-lxc_global_config_value.patch @@ -1,7 +1,7 @@ -From 3e915fc0e452dc7488694f81e1727e979d7afee0 Mon Sep 17 00:00:00 2001 +From 7bb780cc04729b9a9231a9403b8ac5465c0ca44b Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 17 Jan 2019 07:43:23 -0500 -Subject: [PATCH 047/138] Fix memory leak in lxc_global_config_value +Subject: [PATCH 047/139] Fix memory leak in lxc_global_config_value Signed-off-by: LiFeng --- diff --git a/0048-clear-ONLCR-flag-from-master-of-terminal.patch b/0048-clear-ONLCR-flag-from-master-of-terminal.patch index faa035146315f7cdb6bbf74b08495f197cbb56d8..bb05f83c7954e8bbe0610a0f8a818e4bcb6c2cf3 100644 --- a/0048-clear-ONLCR-flag-from-master-of-terminal.patch +++ b/0048-clear-ONLCR-flag-from-master-of-terminal.patch @@ -1,7 +1,7 @@ -From e98cf0e42079d5fd184b6749c4fdb2467c2ce604 Mon Sep 17 00:00:00 2001 +From 2b9f7cb1c39c18bd79f208f178d740fb1103f5e8 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 17 Jan 2019 20:46:33 +0800 -Subject: [PATCH 048/138] clear ONLCR flag from master of terminal +Subject: [PATCH 048/139] clear ONLCR flag from master of terminal clear ONLCR flag from master of terminal diff --git a/0049-Add-100ms-timeout-for-console-epoll.patch b/0049-Add-100ms-timeout-for-console-epoll.patch index 184abb380f844cdb86b1c76f2fff0a58f2ee2682..3ca06c0a5202985edcb80ab7651910827608f35b 100644 --- a/0049-Add-100ms-timeout-for-console-epoll.patch +++ b/0049-Add-100ms-timeout-for-console-epoll.patch @@ -1,7 +1,7 @@ -From 4bbef7bdc1a6d77804cad26bd16ff0d9dd219eb4 Mon Sep 17 00:00:00 2001 +From da947d1642aaade0f814dcea53f8f577f28187b1 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 19 Jan 2019 02:05:17 -0500 -Subject: [PATCH 049/138] Add 100ms timeout for console epoll +Subject: [PATCH 049/139] Add 100ms timeout for console epoll add 100ms timeout for console epoll to avoid lose console diff --git a/0050-seccomp-add-rules-for-specified-architecture-only.patch b/0050-seccomp-add-rules-for-specified-architecture-only.patch index 00a8a685891abc478ff12973440e1c9cf605b838..3e224970f6e44e03e277baeae3c5f7e42f1f5661 100644 --- a/0050-seccomp-add-rules-for-specified-architecture-only.patch +++ b/0050-seccomp-add-rules-for-specified-architecture-only.patch @@ -1,7 +1,7 @@ -From 4a00131ad51ab942e847a19192becac112830be4 Mon Sep 17 00:00:00 2001 +From db80cc666f47124c166771fbd018855f62ea0de3 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 18 Jan 2019 02:11:11 -0500 -Subject: [PATCH 050/138] seccomp: add rules for specified architecture only +Subject: [PATCH 050/139] seccomp: add rules for specified architecture only LXC MR: https://github.com/lxc/lxc/pull/2786 diff --git a/0051-if-ocihook-is-empty.patch b/0051-if-ocihook-is-empty.patch index e51a1ca6b589dd17542163c86b968773e6811f93..e1a3554d3ec0984706f84f2abe58a4d487db1809 100644 --- a/0051-if-ocihook-is-empty.patch +++ b/0051-if-ocihook-is-empty.patch @@ -1,7 +1,7 @@ -From 48ba71bbd898db500f486f7c33cb48a7a9908713 Mon Sep 17 00:00:00 2001 +From 4355ae3c26f9cc26d9c95672945ca2630466b3d0 Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 22 Jan 2019 11:25:45 +0800 -Subject: [PATCH 051/138] if ocihook is empty +Subject: [PATCH 051/139] if ocihook is empty return success diff --git a/0052-Fix-seccomp-fail-when-all-specified-in-config.patch b/0052-Fix-seccomp-fail-when-all-specified-in-config.patch index be87001868e48392aa15f5aee92842cfecadd54a..d0426753c884af253b4b4d61d24ebbece494e10c 100644 --- a/0052-Fix-seccomp-fail-when-all-specified-in-config.patch +++ b/0052-Fix-seccomp-fail-when-all-specified-in-config.patch @@ -1,7 +1,7 @@ -From 5c54d741ab4b4c4a064aaf006c38ef10c4f43dca Mon Sep 17 00:00:00 2001 +From d945679e11c19594e13ec8c2fbbaeb65d2f59f60 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 21 Jan 2019 23:28:43 -0500 -Subject: [PATCH 052/138] Fix seccomp fail when [all] specified in config +Subject: [PATCH 052/139] Fix seccomp fail when [all] specified in config Signed-off-by: LiFeng --- diff --git a/0053-destroy-empty-cgroup-path-return-ture.patch b/0053-destroy-empty-cgroup-path-return-ture.patch index f807c2bea3f221acb313e9a002d1f2b84bdeb0bd..365f7e7d06785b8fc37171c351e8068574fb2fe7 100644 --- a/0053-destroy-empty-cgroup-path-return-ture.patch +++ b/0053-destroy-empty-cgroup-path-return-ture.patch @@ -1,7 +1,7 @@ -From a72808463a6f6ae225f2e7ba927973c6817f5496 Mon Sep 17 00:00:00 2001 +From 930e729ff7705532bf0248ec0c35017dbd8fbd9c Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 22 Jan 2019 14:45:54 +0800 -Subject: [PATCH 053/138] destroy empty cgroup path return ture +Subject: [PATCH 053/139] destroy empty cgroup path return ture destroy empty cgroup path return ture diff --git a/0054-fix-invalid-log-message.patch b/0054-fix-invalid-log-message.patch index af8330438b982b6910ae405e4d38b278ae11069e..a7330bf9780829ca1e37406693ca54e3ae375913 100644 --- a/0054-fix-invalid-log-message.patch +++ b/0054-fix-invalid-log-message.patch @@ -1,7 +1,7 @@ -From 18727f1d50acf2a01e3f593e016ffdb06cef7f16 Mon Sep 17 00:00:00 2001 +From f6a4f1363e2e380cad2fe973cd0b0b3a6e4a37ea Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 22 Jan 2019 20:14:53 +0800 -Subject: [PATCH 054/138] fix invalid log message +Subject: [PATCH 054/139] fix invalid log message fix invalid log message diff --git a/0055-Fix-compile-error.patch b/0055-Fix-compile-error.patch index c33030d8529330867c36ab3d830fe71e3e88d1dc..468dabbebc6bf51b7588fdaa80240f17caf5990c 100644 --- a/0055-Fix-compile-error.patch +++ b/0055-Fix-compile-error.patch @@ -1,7 +1,7 @@ -From 4ee09d4e9110bc6073db74cbf90de696c8104d1e Mon Sep 17 00:00:00 2001 +From 7e6b4062ab3ea0b7ef35d5b19d81b39eb29ea8d5 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 24 Jan 2019 05:14:24 -0500 -Subject: [PATCH 055/138] Fix compile error +Subject: [PATCH 055/139] Fix compile error Signed-off-by: LiFeng --- diff --git a/0056-caps-use-_LINUX_CAPABILITY_VERSION_3-to-set-cap.patch b/0056-caps-use-_LINUX_CAPABILITY_VERSION_3-to-set-cap.patch index 6ad553174f940b574763901dd4d8ba191581d7aa..b52074c2385039d13525d3860e9ef86ec699252d 100644 --- a/0056-caps-use-_LINUX_CAPABILITY_VERSION_3-to-set-cap.patch +++ b/0056-caps-use-_LINUX_CAPABILITY_VERSION_3-to-set-cap.patch @@ -1,7 +1,7 @@ -From fce70a877da27262b274e56e5b31fbd16753adff Mon Sep 17 00:00:00 2001 +From a847fcefdce50fa6b6fe307ff4f80d9f7927eb35 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 26 Jan 2019 02:22:48 -0500 -Subject: [PATCH 056/138] [caps]: use _LINUX_CAPABILITY_VERSION_3 to set cap +Subject: [PATCH 056/139] [caps]: use _LINUX_CAPABILITY_VERSION_3 to set cap Signed-off-by: LiFeng --- diff --git a/0057-confile-add-support-umask.patch b/0057-confile-add-support-umask.patch index d79b14a9aa7f778f752a8cfe324227d5a52a52c3..78db0ad9c087db27a0d8bdf837a5e1fae805b4da 100644 --- a/0057-confile-add-support-umask.patch +++ b/0057-confile-add-support-umask.patch @@ -1,7 +1,7 @@ -From 428aeee42cc96d20dc7934e2ac038561ca9cde3d Mon Sep 17 00:00:00 2001 +From 2946339a18ea794a8a4637353ea5c30045131bba Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 30 Jan 2019 03:39:42 -0500 -Subject: [PATCH 057/138] confile: add support umask +Subject: [PATCH 057/139] confile: add support umask lxc.isulad.umask=normal make the container umask to 0022 lxc.isulad.umask=secure make the container umask to 0027 (default) diff --git a/0058-do-not-check-ppid-when-set-death-signal.patch b/0058-do-not-check-ppid-when-set-death-signal.patch index e3e917046e1397f86dd0b48605143bd63be5c500..36f65216dfb02c43d4fcb10eb7dd1d1b3355753e 100644 --- a/0058-do-not-check-ppid-when-set-death-signal.patch +++ b/0058-do-not-check-ppid-when-set-death-signal.patch @@ -1,7 +1,7 @@ -From 33c5b695d265b115b6ff96bbc33152feb4e69473 Mon Sep 17 00:00:00 2001 +From 9fa6889015604b101ce921c70d8dadb2c70358d0 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 12 Feb 2019 14:00:47 +0800 -Subject: [PATCH 058/138] do not check ppid when set death signal +Subject: [PATCH 058/139] do not check ppid when set death signal ppid will not be 0 if we shared host pid diff --git a/0059-delete-unused-variable-ppid.patch b/0059-delete-unused-variable-ppid.patch index 6c891d352feba920ac3417949985782e9b087c70..bff6ca793eef613b18cb292092e9a808334fb272 100644 --- a/0059-delete-unused-variable-ppid.patch +++ b/0059-delete-unused-variable-ppid.patch @@ -1,7 +1,7 @@ -From 784667557d28af0e18296cff022e69632a85f706 Mon Sep 17 00:00:00 2001 +From d8e4fcd5e937cd4800f44e20afb6161be5671f9a Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 12 Feb 2019 14:36:35 +0800 -Subject: [PATCH 059/138] delete unused variable ppid +Subject: [PATCH 059/139] delete unused variable ppid Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0060-using-json-file-to-write-console-log-of-container.patch b/0060-using-json-file-to-write-console-log-of-container.patch index a00af4b56674a8ee10c8d5e9878e6075b94d65e3..2e6bee70328f7cc1dd4ef4737bbf3742de20d41e 100644 --- a/0060-using-json-file-to-write-console-log-of-container.patch +++ b/0060-using-json-file-to-write-console-log-of-container.patch @@ -1,7 +1,7 @@ -From d8efea3a4bd5c23eb18de98c5a7f908fd6409e60 Mon Sep 17 00:00:00 2001 +From 28d6bb955b254a0dd29bf47dc359359ba3da579f Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 30 Jan 2019 17:44:19 +0800 -Subject: [PATCH 060/138] using json-file to write console log of container +Subject: [PATCH 060/139] using json-file to write console log of container Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0061-Fix-hook-use-the-path-args-envs-execvp-dirctory.patch b/0061-Fix-hook-use-the-path-args-envs-execvp-dirctory.patch index 0e4508919a100fb762142df9cced28556988dbe4..e2a91a7ccca974abe43b5346787419430e0bce8b 100644 --- a/0061-Fix-hook-use-the-path-args-envs-execvp-dirctory.patch +++ b/0061-Fix-hook-use-the-path-args-envs-execvp-dirctory.patch @@ -1,7 +1,7 @@ -From 105b7c1dc22ec9928a42e803f32f9a4b461a6a3a Mon Sep 17 00:00:00 2001 +From 15ecacd152d85b4f7818e7612178081a23e53826 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 21 Feb 2019 05:37:05 -0500 -Subject: [PATCH 061/138] Fix hook: use the path, args, envs execvp dirctory +Subject: [PATCH 061/139] Fix hook: use the path, args, envs execvp dirctory Signed-off-by: LiFeng --- diff --git a/0062-setup-sysctls-before-set-read-only-path-and-masked-p.patch b/0062-setup-sysctls-before-set-read-only-path-and-masked-p.patch index fcc9708bc874bc1a71eb0eea49f920e97afd6898..6edd5b3172688afc97f3f60c1a4c9d8de4bcf895 100644 --- a/0062-setup-sysctls-before-set-read-only-path-and-masked-p.patch +++ b/0062-setup-sysctls-before-set-read-only-path-and-masked-p.patch @@ -1,7 +1,7 @@ -From 90ed6cee52d52bb153c139ece83ccfbf46f79a44 Mon Sep 17 00:00:00 2001 +From bf15038f2d74cf77c2475bd1068cdeaa4bf6b94d Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 26 Feb 2019 17:21:18 +0800 -Subject: [PATCH 062/138] setup sysctls before set read-only path and masked +Subject: [PATCH 062/139] setup sysctls before set read-only path and masked path Signed-off-by: tanyifeng diff --git a/0063-lxc-ignore-systemcall-load-failure-error.patch b/0063-lxc-ignore-systemcall-load-failure-error.patch index ff84d94846735a94ca3a756d6d69aa31f0d8dd87..74a1719a05f098f2a25202321a91f3f74b42d18b 100644 --- a/0063-lxc-ignore-systemcall-load-failure-error.patch +++ b/0063-lxc-ignore-systemcall-load-failure-error.patch @@ -1,7 +1,7 @@ -From 317002555ed41c63b119799aff15196e8bd99124 Mon Sep 17 00:00:00 2001 +From d7adb15dabbc3468675be2b966806574222495e5 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 9 Mar 2019 03:10:06 +0800 -Subject: [PATCH 063/138] lxc: ignore systemcall load failure error +Subject: [PATCH 063/139] lxc: ignore systemcall load failure error Signed-off-by: wujing Signed-off-by: LiFeng diff --git a/0064-lxc-Reduce-seccomp-processing-log-level.patch b/0064-lxc-Reduce-seccomp-processing-log-level.patch index bef004529eb7193b8167130091f6cf3c1d827dda..7bbd8e5c020aa781cd2a6305341db2b298d9dfd3 100644 --- a/0064-lxc-Reduce-seccomp-processing-log-level.patch +++ b/0064-lxc-Reduce-seccomp-processing-log-level.patch @@ -1,7 +1,7 @@ -From d058d9203581f1c883910c6b51f2faf95bf33634 Mon Sep 17 00:00:00 2001 +From 41491565e90465d2d0e64c268ba3d8d3279c6556 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sun, 10 Mar 2019 00:47:05 +0800 -Subject: [PATCH 064/138] lxc: Reduce seccomp processing log level +Subject: [PATCH 064/139] lxc: Reduce seccomp processing log level Signed-off-by: wujing Signed-off-by: LiFeng diff --git a/0065-Storage-return-true-if-storage_init-init-fail.patch b/0065-Storage-return-true-if-storage_init-init-fail.patch index f6b26d55cfb1abe48a2810e0b19f24ac7577d96a..6a9259cc5cd68889e08108cd6f1dbb685ab17e04 100644 --- a/0065-Storage-return-true-if-storage_init-init-fail.patch +++ b/0065-Storage-return-true-if-storage_init-init-fail.patch @@ -1,7 +1,7 @@ -From a7911877ab97ce77a810f57ff4a3e4a9383f6f9d Mon Sep 17 00:00:00 2001 +From b4774d615555f3864720d7dd33b87e6d4ffccd36 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 11 Mar 2019 23:26:27 -0400 -Subject: [PATCH 065/138] Storage: return true if storage_init init fail +Subject: [PATCH 065/139] Storage: return true if storage_init init fail Signed-off-by: LiFeng --- diff --git a/0066-lxc-Pids-limit-does-not-report-an-error-after-execut.patch b/0066-lxc-Pids-limit-does-not-report-an-error-after-execut.patch index e1bad41202328b81b990dd540088e86bfb83c472..e5ec9aa2bca9708be1e5fa07665208e1b1408ca6 100644 --- a/0066-lxc-Pids-limit-does-not-report-an-error-after-execut.patch +++ b/0066-lxc-Pids-limit-does-not-report-an-error-after-execut.patch @@ -1,7 +1,7 @@ -From 62a3cf699d424e956cc7f7a73d425c5828f64902 Mon Sep 17 00:00:00 2001 +From 374e9e275bd379cfb70df2b252383a50869c42f6 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 15 Mar 2019 10:11:10 +0800 -Subject: [PATCH 066/138] lxc: Pids limit does not report an error after +Subject: [PATCH 066/139] lxc: Pids limit does not report an error after executing the limit in the background Signed-off-by: wujing diff --git a/0067-lxc-report-error-when-remove-directory-failed.patch b/0067-lxc-report-error-when-remove-directory-failed.patch index 8f4d93c6fbb811da0e3af00f24cf3808e4a55219..535ae53afa13aeda58fa3306117c7d9f016cfc70 100644 --- a/0067-lxc-report-error-when-remove-directory-failed.patch +++ b/0067-lxc-report-error-when-remove-directory-failed.patch @@ -1,7 +1,7 @@ -From 44a5db6680dd81a11cd1afe87fae9ad63dc30f34 Mon Sep 17 00:00:00 2001 +From c3b0074f845e009695ae55f8ef01b9e7ba450350 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 16 Mar 2019 10:06:13 +0800 -Subject: [PATCH 067/138] lxc: report error when remove directory failed +Subject: [PATCH 067/139] lxc: report error when remove directory failed Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0068-support-record-stdout-stderr-log-of-container-consol.patch b/0068-support-record-stdout-stderr-log-of-container-consol.patch index f6e54fcae3d0987d6d0eded21fe1ebed025f2c3e..534ae1e26a537a88bc5ee19292ed9d9a9e66d5b3 100644 --- a/0068-support-record-stdout-stderr-log-of-container-consol.patch +++ b/0068-support-record-stdout-stderr-log-of-container-consol.patch @@ -1,7 +1,7 @@ -From 1c4b55f4bb5d7b9720153073e78facb69fe220d1 Mon Sep 17 00:00:00 2001 +From 25e6f0bfa28a7da88a54da99123e2bbd60da2cb2 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Feb 2019 20:27:47 +0800 -Subject: [PATCH 068/138] support record stdout, stderr log of container +Subject: [PATCH 068/139] support record stdout, stderr log of container console Signed-off-by: tanyifeng diff --git a/0069-lxc-killall-processes-if-container-shared-pid-namesp.patch b/0069-lxc-killall-processes-if-container-shared-pid-namesp.patch index b03933a001bdfe7df38a43cdf2264cb25276ae42..64a2f3874ba99bf498c6cc3bfd59781657c4c68d 100644 --- a/0069-lxc-killall-processes-if-container-shared-pid-namesp.patch +++ b/0069-lxc-killall-processes-if-container-shared-pid-namesp.patch @@ -1,7 +1,7 @@ -From 59e028b4aeb70a9c9897e0ecfea79e455799937d Mon Sep 17 00:00:00 2001 +From 87e3f205f62dc0f49be1857c6a0a72a57bdc201a Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Mar 2019 15:48:02 +0800 -Subject: [PATCH 069/138] lxc: killall processes if container shared pid +Subject: [PATCH 069/139] lxc: killall processes if container shared pid namespace Signed-off-by: tanyifeng diff --git a/0070-lxc-signal-all-process-for-shared-container-when-con.patch b/0070-lxc-signal-all-process-for-shared-container-when-con.patch index 8602874b92cd24ff246b66eb0260033a44fbe5c9..461f6e14404639a41102f4ccfa81cec2568e1f65 100644 --- a/0070-lxc-signal-all-process-for-shared-container-when-con.patch +++ b/0070-lxc-signal-all-process-for-shared-container-when-con.patch @@ -1,7 +1,7 @@ -From e54379b65d19ab25dbe69cf16d3180ae923bf27b Mon Sep 17 00:00:00 2001 +From b7771f88ab84ae04960a3d8f40bfea7093ff4cb7 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Mar 2019 17:21:44 +0800 -Subject: [PATCH 070/138] lxc: signal all process for shared container when +Subject: [PATCH 070/139] lxc: signal all process for shared container when container init exited Signed-off-by: tanyifeng diff --git a/0071-lxc-get-cgroup-path-according-to-cgroup-mountpoint.patch b/0071-lxc-get-cgroup-path-according-to-cgroup-mountpoint.patch index b48472a5b2ab1f9220f6addf7d0b078e66fb1dbb..e5a9e785a6c478f6b9b212199c932151f2573a02 100644 --- a/0071-lxc-get-cgroup-path-according-to-cgroup-mountpoint.patch +++ b/0071-lxc-get-cgroup-path-according-to-cgroup-mountpoint.patch @@ -1,7 +1,7 @@ -From 256621e2c0e0840a78dced3042b161d62dfa4e36 Mon Sep 17 00:00:00 2001 +From 0ec5d80c41491e4f2fa2e117fc6db4c205e1e415 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Mar 2019 22:05:09 +0800 -Subject: [PATCH 071/138] lxc: get cgroup path according to cgroup mountpoint +Subject: [PATCH 071/139] lxc: get cgroup path according to cgroup mountpoint Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0072-lxc-adapt-to-docker-18.09.patch b/0072-lxc-adapt-to-docker-18.09.patch index 08e1f0f10e28592b1b4db77d07b668af43c4acd9..860d0cc9f7b6bffb85154c45f671d368a77d3fef 100644 --- a/0072-lxc-adapt-to-docker-18.09.patch +++ b/0072-lxc-adapt-to-docker-18.09.patch @@ -1,7 +1,7 @@ -From 925d583b2ca80a2352ebe70ce3320b3085bb37a6 Mon Sep 17 00:00:00 2001 +From d69ef31d49418d02a644c802c47f9e933fb186c3 Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 25 Mar 2019 18:03:23 +0800 -Subject: [PATCH 072/138] lxc: adapt to docker-18.09 +Subject: [PATCH 072/139] lxc: adapt to docker-18.09 1. adapt to docker-18.09 2. fix strlcpy bug diff --git a/0073-lxc-support-set-additional-groups.patch b/0073-lxc-support-set-additional-groups.patch index e94a05090cc63a0852fe247c129b9ed0965fb940..7c83b93d435dc8b984c6b5012725a914c40a875a 100644 --- a/0073-lxc-support-set-additional-groups.patch +++ b/0073-lxc-support-set-additional-groups.patch @@ -1,7 +1,7 @@ -From 4cc2721541aad1ee3a446c3582eaa3c963161d09 Mon Sep 17 00:00:00 2001 +From 9d41aabd89b3e9de7cfedf4330bfb5984bd43dbc Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 25 Mar 2019 17:17:00 +0800 -Subject: [PATCH 073/138] lxc: support set additional groups +Subject: [PATCH 073/139] lxc: support set additional groups Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0074-lxc-only-add-valid-fd-to-mainloop.patch b/0074-lxc-only-add-valid-fd-to-mainloop.patch index 252587c0f635ce233849f3f49ec1306c18855a0c..61d90bfb773a43dd360d99cee2a371b074a393e7 100644 --- a/0074-lxc-only-add-valid-fd-to-mainloop.patch +++ b/0074-lxc-only-add-valid-fd-to-mainloop.patch @@ -1,7 +1,7 @@ -From 45c8390dc7f725365eabe1f9e63bad0e913a15d1 Mon Sep 17 00:00:00 2001 +From 0f17217d431458de75d33c4a80ce28eac1bbb2c5 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 26 Mar 2019 16:11:13 +0800 -Subject: [PATCH 074/138] lxc: only add valid fd to mainloop +Subject: [PATCH 074/139] lxc: only add valid fd to mainloop Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0075-lxc-add-timeout-for-attach.patch b/0075-lxc-add-timeout-for-attach.patch index 2c82acbaefe4f74e1ab326b65956e24c706eb841..4f41d6fca7d3324a44fa20d623fe16a98cc7a1c5 100644 --- a/0075-lxc-add-timeout-for-attach.patch +++ b/0075-lxc-add-timeout-for-attach.patch @@ -1,7 +1,7 @@ -From 070fe7892e591a7c5836511dd2d0b9e969a18798 Mon Sep 17 00:00:00 2001 +From 6affa9bf74fcc2ebb1dd785b73a47552669af82e Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 3 Apr 2019 19:54:36 +0800 -Subject: [PATCH 075/138] lxc: add timeout for attach +Subject: [PATCH 075/139] lxc: add timeout for attach Signed-off-by: wujing Signed-off-by: LiFeng diff --git a/0076-lxc-delete-unused-variable.patch b/0076-lxc-delete-unused-variable.patch index 405b6bbd7f6eac336749bf3bcbef09ac0b43dbc4..523d3f7884082da2e4bf142359d13b645a6a7bcb 100644 --- a/0076-lxc-delete-unused-variable.patch +++ b/0076-lxc-delete-unused-variable.patch @@ -1,7 +1,7 @@ -From 2321335b3482472b0aad5b97ac981ed876e145ba Mon Sep 17 00:00:00 2001 +From 49aea1a5c02f041fc5622ed0a998c2f5b5b45d5b Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 4 Apr 2019 11:19:48 +0800 -Subject: [PATCH 076/138] lxc: delete unused variable +Subject: [PATCH 076/139] lxc: delete unused variable Signed-off-by: wujing Signed-off-by: LiFeng diff --git a/0077-lxc-set-negative-files.limit-to-max-and-fix-bug-of-s.patch b/0077-lxc-set-negative-files.limit-to-max-and-fix-bug-of-s.patch index 0f845cd0c502f84a12ff0953851f922cdade50c4..d60ce0f703c493e49a6c54001ac80e856262c6f1 100644 --- a/0077-lxc-set-negative-files.limit-to-max-and-fix-bug-of-s.patch +++ b/0077-lxc-set-negative-files.limit-to-max-and-fix-bug-of-s.patch @@ -1,7 +1,7 @@ -From 121263ea5ba1302e259320c1a4497f2a549ef4db Mon Sep 17 00:00:00 2001 +From bead04c30d859abd3f0ad7635266f0f29721640a Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 2 Apr 2019 23:59:20 -0400 -Subject: [PATCH 077/138] lxc: set negative files.limit to max and fix bug of +Subject: [PATCH 077/139] lxc: set negative files.limit to max and fix bug of setting homedir Signed-off-by: tanyifeng diff --git a/0078-Run-pre-start-hook-before-chroot.patch b/0078-Run-pre-start-hook-before-chroot.patch index 74d8382b9190c29fe67efb982c7f249d3455d36b..3072948ec7bb555088622dbee8204c441e5a951b 100644 --- a/0078-Run-pre-start-hook-before-chroot.patch +++ b/0078-Run-pre-start-hook-before-chroot.patch @@ -1,7 +1,7 @@ -From f4802de0f33c70fa299d5fb8f73c179eb457a7e4 Mon Sep 17 00:00:00 2001 +From 613aa707fc904d35dbcbe9c6ecf42e0851aa4492 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 3 Apr 2019 23:36:04 -0400 -Subject: [PATCH 078/138] Run pre-start hook before chroot +Subject: [PATCH 078/139] Run pre-start hook before chroot Signed-off-by: LiFeng --- diff --git a/0079-inherid-env-from-parent-in-oci-hooks.patch b/0079-inherid-env-from-parent-in-oci-hooks.patch index 83d45deed6da471fe9e081ec2992e9a506a249d6..13630e06b0c605a467b7a991d97c268d40efd237 100644 --- a/0079-inherid-env-from-parent-in-oci-hooks.patch +++ b/0079-inherid-env-from-parent-in-oci-hooks.patch @@ -1,7 +1,7 @@ -From 68184e1b144b0ce9bb39534d712f022773819173 Mon Sep 17 00:00:00 2001 +From d7ebde92b6ceb66aef1280e7a81191bf5ef69ac9 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 4 Apr 2019 17:21:56 +0800 -Subject: [PATCH 079/138] inherid env from parent in oci hooks +Subject: [PATCH 079/139] inherid env from parent in oci hooks env: LD_LIBRAY_PAHT and PATH diff --git a/0080-lxc-fix-compile-error.patch b/0080-lxc-fix-compile-error.patch index e9d6f6abb1a91e3b0a2317fa04dd384c1116a06c..f62cfa7a53107fdd9a0ddb65d10431170603c938 100644 --- a/0080-lxc-fix-compile-error.patch +++ b/0080-lxc-fix-compile-error.patch @@ -1,7 +1,7 @@ -From fd14c1b679220e7b4554afcca3de7d7cd9588997 Mon Sep 17 00:00:00 2001 +From 12b020ddc343d35e4db1c23de7c511deb3b9f4a3 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 8 Apr 2019 08:29:46 -0400 -Subject: [PATCH 080/138] lxc: fix compile error +Subject: [PATCH 080/139] lxc: fix compile error Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0081-lxc-Change-the-range-of-attach-timeout.patch b/0081-lxc-Change-the-range-of-attach-timeout.patch index 3fc854390215c16f22a2138fba7349bdef4b69b0..e4253a5cb75023f661aee5a293b237996885a430 100644 --- a/0081-lxc-Change-the-range-of-attach-timeout.patch +++ b/0081-lxc-Change-the-range-of-attach-timeout.patch @@ -1,7 +1,7 @@ -From 1c0c1b59116fde86d5bbaff143c1678a0c7414b0 Mon Sep 17 00:00:00 2001 +From 08f5898a07450f2fb547409843fb9cf67f74ade9 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 8 Apr 2019 16:42:43 +0800 -Subject: [PATCH 081/138] lxc: Change the range of attach timeout +Subject: [PATCH 081/139] lxc: Change the range of attach timeout Signed-off-by: wujing Signed-off-by: LiFeng diff --git a/0082-lxc-fix-memory-leak-cause-by-setenv.patch b/0082-lxc-fix-memory-leak-cause-by-setenv.patch index 61686f28f3e66bcb92da13c8a7c02784fb7bb27b..cd11f04ccfa4bf4f992760a1bbe77ec2e8389213 100644 --- a/0082-lxc-fix-memory-leak-cause-by-setenv.patch +++ b/0082-lxc-fix-memory-leak-cause-by-setenv.patch @@ -1,7 +1,7 @@ -From 0ba955160234c68f8db801111618551e6303627b Mon Sep 17 00:00:00 2001 +From 9acd5efe54f66552a3389938c0ec86356ac8f039 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Apr 2019 15:27:31 +0800 -Subject: [PATCH 082/138] lxc: fix memory leak cause by setenv +Subject: [PATCH 082/139] lxc: fix memory leak cause by setenv isulad will call do_lxcapi_clean_resource(), so setenv at here, will change env of isulad. diff --git a/0083-lxc-free-lxc-handler.patch b/0083-lxc-free-lxc-handler.patch index 9a192b93e647062673d9bc58f465c3f2b8a54bd3..6e3cd2bfc01582c87a08a987dcc17a2f80eab222 100644 --- a/0083-lxc-free-lxc-handler.patch +++ b/0083-lxc-free-lxc-handler.patch @@ -1,7 +1,7 @@ -From 3b253a4a69bc3e239244f7ed0aaab7d8d2bf4187 Mon Sep 17 00:00:00 2001 +From 72d6a0b51dbcf6ef3c8eaa1ba5c3495ee1460083 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Apr 2019 20:34:51 +0800 -Subject: [PATCH 083/138] lxc: free lxc-handler +Subject: [PATCH 083/139] lxc: free lxc-handler free handler if failed diff --git a/0084-lxc-memory-leak-of-lxc_grow_array.patch b/0084-lxc-memory-leak-of-lxc_grow_array.patch index eaa3f47d4c013524710a61e403a8c770ec0cd08e..d150f76d518f1a5e96cfb323e699779685b29e5f 100644 --- a/0084-lxc-memory-leak-of-lxc_grow_array.patch +++ b/0084-lxc-memory-leak-of-lxc_grow_array.patch @@ -1,7 +1,7 @@ -From 1cdc72bef5e05efbbd29b92212deeb16e6fe3457 Mon Sep 17 00:00:00 2001 +From 2d6f584233d57b6a97ed9246969be387017c8323 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Apr 2019 22:36:42 +0800 -Subject: [PATCH 084/138] lxc: memory leak of lxc_grow_array +Subject: [PATCH 084/139] lxc: memory leak of lxc_grow_array fix memory leak of lxc_grow_array diff --git a/0085-lxc-update-json-file-from-isulad.patch b/0085-lxc-update-json-file-from-isulad.patch index d4217bb83edc637e7372bc3c29ab645204b3ef36..e17cf09b13e81de3ee7b9ced4310c6f3fdb2fb4a 100644 --- a/0085-lxc-update-json-file-from-isulad.patch +++ b/0085-lxc-update-json-file-from-isulad.patch @@ -1,7 +1,7 @@ -From a8fbe4a4242932aec877ac051bec80ee15a9763b Mon Sep 17 00:00:00 2001 +From 6e5b1a93fb3fd25d23ad4cf8cc99251a863cccd3 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 12 Apr 2019 06:06:12 -0400 -Subject: [PATCH 085/138] lxc: update json file from isulad +Subject: [PATCH 085/139] lxc: update json file from isulad Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0086-confile-add-support-systemd.patch b/0086-confile-add-support-systemd.patch index 3dbb4ce4900c3ae8fed3ec35aa9e53526b4fa6f1..2bf1f0c63b7c455d645a34540757641a2dd541a3 100644 --- a/0086-confile-add-support-systemd.patch +++ b/0086-confile-add-support-systemd.patch @@ -1,7 +1,7 @@ -From a717837708d91574471645822071d349e60d0678 Mon Sep 17 00:00:00 2001 +From 685248157e305ad6abe798cb40409ad55eb63c16 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 20 Apr 2019 22:40:18 +0800 -Subject: [PATCH 086/138] confile: add support systemd +Subject: [PATCH 086/139] confile: add support systemd lxc.isulad.systemd=true remount systemd cgroup path to rw diff --git a/0087-lxc-adapt-to-spec-of-oci-hook.patch b/0087-lxc-adapt-to-spec-of-oci-hook.patch index 7b71fb22d417abffb700df14229e7f79472b5e75..52bad2b05f1678e093a6235a8907b8050bada860 100644 --- a/0087-lxc-adapt-to-spec-of-oci-hook.patch +++ b/0087-lxc-adapt-to-spec-of-oci-hook.patch @@ -1,7 +1,7 @@ -From 65d32efd1e3165badbfc731a0750e6e895be4fb7 Mon Sep 17 00:00:00 2001 +From a3f93824beaa0cb2634a4d6db268c1b90d5a7524 Mon Sep 17 00:00:00 2001 From: liuhao Date: Wed, 24 Apr 2019 22:22:55 +0800 -Subject: [PATCH 087/138] lxc: adapt to spec of oci hook +Subject: [PATCH 087/139] lxc: adapt to spec of oci hook poststart failed do not cause run failed diff --git a/0088-fix-lxc-build-error.patch b/0088-fix-lxc-build-error.patch index 577f36dd4f9b7e41a9bcefd07b4f9fc308a97e45..06260065b4c1a4ff9d7c9579fd49bf64e7f4fe91 100644 --- a/0088-fix-lxc-build-error.patch +++ b/0088-fix-lxc-build-error.patch @@ -1,7 +1,7 @@ -From 0c0588bd00878eaf2add137bb29bf225eaa8d904 Mon Sep 17 00:00:00 2001 +From d1adce7546410b4fa916c99a1807b653e6a950dd Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 25 Apr 2019 10:12:16 +0800 -Subject: [PATCH 088/138] fix lxc build error +Subject: [PATCH 088/139] fix lxc build error cause by invalid print format diff --git a/0089-lxc-add-get-container-processes-pids-func.patch b/0089-lxc-add-get-container-processes-pids-func.patch index 3c3e6f9df792e171af659dddd183fb91f746dbd5..c3d9c2436de6802bc6561e994d632031600562ea 100644 --- a/0089-lxc-add-get-container-processes-pids-func.patch +++ b/0089-lxc-add-get-container-processes-pids-func.patch @@ -1,7 +1,7 @@ -From 4b7a4621c0dfd5545c4b2e77a6c805b0d38d3d38 Mon Sep 17 00:00:00 2001 +From cf0675d14282a391ea088310d75354a2196125ac Mon Sep 17 00:00:00 2001 From: maoweiyong Date: Tue, 23 Apr 2019 12:12:55 +0800 -Subject: [PATCH 089/138] lxc:add get container processes pids func +Subject: [PATCH 089/139] lxc:add get container processes pids func Signed-off-by: maoweiyong --- diff --git a/0090-lxc-remove-unused-variable.patch b/0090-lxc-remove-unused-variable.patch index 61562cfb736f19aa62b91d97183781b1484a9d94..8c3bbb41b49adb36ceb9487a29e0b18a977ea1f1 100644 --- a/0090-lxc-remove-unused-variable.patch +++ b/0090-lxc-remove-unused-variable.patch @@ -1,7 +1,7 @@ -From 9e36bb4d725edd77b84e2d9f2d0e07db69d6af33 Mon Sep 17 00:00:00 2001 +From c488db18d557594331fd8d2774d9e05eaeb57726 Mon Sep 17 00:00:00 2001 From: maoweiyong Date: Thu, 25 Apr 2019 21:21:12 +0800 -Subject: [PATCH 090/138] lxc: remove unused variable +Subject: [PATCH 090/139] lxc: remove unused variable Signed-off-by: maoweiyong --- diff --git a/0091-lxc-support-namespaced-kernel-params-can-be-changed-.patch b/0091-lxc-support-namespaced-kernel-params-can-be-changed-.patch index 3b6f364ad9ec1f03bba3a5ed6b252d08c6fbe82d..e960470b7b75124ad29c880cefe5bf6e1641dbfb 100644 --- a/0091-lxc-support-namespaced-kernel-params-can-be-changed-.patch +++ b/0091-lxc-support-namespaced-kernel-params-can-be-changed-.patch @@ -1,7 +1,7 @@ -From 6091a808d2eca19f7e7f1ac11dae8f2ca9574a9e Mon Sep 17 00:00:00 2001 +From 474dcbe83981a95fe3be1f1da0d4289730a29a1c Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 26 Apr 2019 07:13:53 +0800 -Subject: [PATCH 091/138] lxc: support namespaced kernel params can be changed +Subject: [PATCH 091/139] lxc: support namespaced kernel params can be changed in system container support namespaced kernel params can be changed in system container diff --git a/0092-lxc-add-output-error-when-create-unified-cgroup.patch b/0092-lxc-add-output-error-when-create-unified-cgroup.patch index 7f8f749459346c82b64fe301ee42c3d999daa992..a3157aacaaf84855e63374421abefcf3dd8c11a2 100644 --- a/0092-lxc-add-output-error-when-create-unified-cgroup.patch +++ b/0092-lxc-add-output-error-when-create-unified-cgroup.patch @@ -1,7 +1,7 @@ -From 7ba873cf2e58458f4faf58ec98912d7d635f73b5 Mon Sep 17 00:00:00 2001 +From ea3990558d3583344654675edce9458ec257fd38 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 29 Apr 2019 04:13:52 -0400 -Subject: [PATCH 092/138] lxc: add output error when create unified cgroup +Subject: [PATCH 092/139] lxc: add output error when create unified cgroup Signed-off-by: LiFeng --- diff --git a/0093-optimize-isulad_kit-operator.patch b/0093-optimize-isulad_kit-operator.patch index 2aa9c0281f66dfcc0cd04f18b5a609fb0b692cb9..6be9b338b7c8bdf15edcb5a991a3e0373c08ad8b 100644 --- a/0093-optimize-isulad_kit-operator.patch +++ b/0093-optimize-isulad_kit-operator.patch @@ -1,7 +1,7 @@ -From 97241ee73a975fb4234d8e83c79d539f41ee348c Mon Sep 17 00:00:00 2001 +From d766442be1dca15cff162671f367fa867ba74c94 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 2 May 2019 11:23:50 +0800 -Subject: [PATCH 093/138] optimize isulad_kit operator +Subject: [PATCH 093/139] optimize isulad_kit operator parse group add start container diff --git a/0094-exec-load-uid-gid-and-groups.patch b/0094-exec-load-uid-gid-and-groups.patch index da3bc122dc55f09c6975f6a8532a3e88312c4940..6b1ca813a25079e76b85083447c49d16131536c8 100644 --- a/0094-exec-load-uid-gid-and-groups.patch +++ b/0094-exec-load-uid-gid-and-groups.patch @@ -1,7 +1,7 @@ -From db3c02168cb0a378c98c9f36ca37dc690d348b68 Mon Sep 17 00:00:00 2001 +From db68b7129fb8813b99364b58ffef086a2df3c426 Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 7 May 2019 12:55:03 +0800 -Subject: [PATCH 094/138] exec load uid gid and groups +Subject: [PATCH 094/139] exec load uid gid and groups exec load uid gid and groups diff --git a/0095-lxc-don-t-use-the-unified-hierarchy-for-the-systemd-.patch b/0095-lxc-don-t-use-the-unified-hierarchy-for-the-systemd-.patch index 16075fc5fd8bf04fb055ee43b986394395772149..e03f51b44f2f93b021995c27319721954e1e94d8 100644 --- a/0095-lxc-don-t-use-the-unified-hierarchy-for-the-systemd-.patch +++ b/0095-lxc-don-t-use-the-unified-hierarchy-for-the-systemd-.patch @@ -1,7 +1,7 @@ -From 5fe1c6fec0943d6eda9a937a0832c66dd8860a1c Mon Sep 17 00:00:00 2001 +From 16038190f1cbbdc58e5b114c049d54bfce72a198 Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 10 May 2019 11:05:42 +0800 -Subject: [PATCH 095/138] lxc: don't use the unified hierarchy for the systemd +Subject: [PATCH 095/139] lxc: don't use the unified hierarchy for the systemd cgroup reason:don't use the unified hierarchy for the systemd cgroup diff --git a/0096-close-inherited-fd-in-hook-process.patch b/0096-close-inherited-fd-in-hook-process.patch index 268dbac8fe4c7f7992eada7849bf71692c72fddd..3be69a9dcca693b4c5c6cd79441203c23a71f2b9 100644 --- a/0096-close-inherited-fd-in-hook-process.patch +++ b/0096-close-inherited-fd-in-hook-process.patch @@ -1,7 +1,7 @@ -From 409fe518357440d5c25886587932b8bec207fa9c Mon Sep 17 00:00:00 2001 +From 0dc5178ad05c6c2106be4f15e8d91211e6246eb5 Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 13 May 2019 16:45:50 +0800 -Subject: [PATCH 096/138] close inherited fd in hook process +Subject: [PATCH 096/139] close inherited fd in hook process close inherited fd in hook process diff --git a/0097-lxc-report-error-when-fork-exec-error-for-hooks.patch b/0097-lxc-report-error-when-fork-exec-error-for-hooks.patch index 7755d9c7d5fc5c3287af3b257e471df9f99e2145..52c8a424b36657acf5799b1db00bef3ca90e9eef 100644 --- a/0097-lxc-report-error-when-fork-exec-error-for-hooks.patch +++ b/0097-lxc-report-error-when-fork-exec-error-for-hooks.patch @@ -1,7 +1,7 @@ -From 386ea470d2371fb7916135e801e0d7f5e3c5b8fa Mon Sep 17 00:00:00 2001 +From 8f74f51e2ea6fb316d99af96f091e35b105402ca Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 15 May 2019 00:53:49 -0400 -Subject: [PATCH 097/138] lxc: report error when fork/exec error for hooks +Subject: [PATCH 097/139] lxc: report error when fork/exec error for hooks Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0098-lxc-make-dev-bind-mount-from-host-tmpfs-for-system-c.patch b/0098-lxc-make-dev-bind-mount-from-host-tmpfs-for-system-c.patch index 100e6753020780fb690f30eb838244f732ae5183..e505e88d24a9cebf094c0c81fc6d36157b047258 100644 --- a/0098-lxc-make-dev-bind-mount-from-host-tmpfs-for-system-c.patch +++ b/0098-lxc-make-dev-bind-mount-from-host-tmpfs-for-system-c.patch @@ -1,7 +1,7 @@ -From 28a3fe0efea9a99a01e91b593be941505162cf1f Mon Sep 17 00:00:00 2001 +From fc25d8c2e9e95f227f13244503b91aaf24367c90 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 15 May 2019 12:42:08 +0800 -Subject: [PATCH 098/138] lxc: make /dev bind mount from host tmpfs for system +Subject: [PATCH 098/139] lxc: make /dev bind mount from host tmpfs for system container reason:make /dev bind mount from host tmpfs for system container diff --git a/0099-terminal-do-not-close-the-master-fd-of-pty.patch b/0099-terminal-do-not-close-the-master-fd-of-pty.patch index d5b432693e594fdbab2b5d84a29f2bd1199d56d8..3f168b34092d6f5f17c0f256b46b7d1e4c9d7be5 100644 --- a/0099-terminal-do-not-close-the-master-fd-of-pty.patch +++ b/0099-terminal-do-not-close-the-master-fd-of-pty.patch @@ -1,7 +1,7 @@ -From bb22a4c3d79d2ad60e00e77cdea7bc782414cf56 Mon Sep 17 00:00:00 2001 +From 0c622aaccfa9ea9bb79fcc6fb1e6643ccc25858b Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 21 May 2019 04:53:16 -0400 -Subject: [PATCH 099/138] terminal: do not close the master fd of pty +Subject: [PATCH 099/139] terminal: do not close the master fd of pty Signed-off-by: LiFeng --- diff --git a/0100-start-add-check-save-pid-info-file.patch b/0100-start-add-check-save-pid-info-file.patch index 0f906e2ad233f94fa52d4239fbd6f0b9643b4c37..ddb38d8b25e3f10c7be1995d1325d0ab5ad67b6d 100644 --- a/0100-start-add-check-save-pid-info-file.patch +++ b/0100-start-add-check-save-pid-info-file.patch @@ -1,7 +1,7 @@ -From 8072ed7597edb3773ba26cd3940ae1ef5f879ae4 Mon Sep 17 00:00:00 2001 +From c6bd787c3cbb63b7a0085e20bd22a530572a2a08 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 22 May 2019 23:00:17 -0400 -Subject: [PATCH 100/138] start: add check save pid info file +Subject: [PATCH 100/139] start: add check save pid info file Signed-off-by: LiFeng --- diff --git a/0101-lxc-fix-code-error.patch b/0101-lxc-fix-code-error.patch index e8dff2bbd136b0f00d89afaa78882beb5fc632d7..84bf1bc77fc9ed958ab61326e7519cf87b0919ca 100644 --- a/0101-lxc-fix-code-error.patch +++ b/0101-lxc-fix-code-error.patch @@ -1,7 +1,7 @@ -From 4eb6383318a8e3beb1c632553a77b4f86e78dd20 Mon Sep 17 00:00:00 2001 +From 788e7b9b251cd81ebb717fc21c50427b671df7ef Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 05:14:46 -0400 -Subject: [PATCH 101/138] lxc: fix code error +Subject: [PATCH 101/139] lxc: fix code error Signed-off-by: LiFeng --- diff --git a/0102-lxc-fix-compile-warnings.patch b/0102-lxc-fix-compile-warnings.patch index 4b83d9f49998516ffbee7b073d97ec4f53592108..1308c2808cbbe20044ea921aaf6d201fc81b1a77 100644 --- a/0102-lxc-fix-compile-warnings.patch +++ b/0102-lxc-fix-compile-warnings.patch @@ -1,7 +1,7 @@ -From abcb5c5bdd46cb83deff2d2af95c26221ef51a8e Mon Sep 17 00:00:00 2001 +From ae1e9bad8f14613c01ce940795472961cc2e9561 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 06:19:07 -0400 -Subject: [PATCH 102/138] lxc: fix compile warnings +Subject: [PATCH 102/139] lxc: fix compile warnings Signed-off-by: LiFeng --- diff --git a/0103-lxc-fix-code-error-in-conf.c.patch b/0103-lxc-fix-code-error-in-conf.c.patch index 0a94927c79385ae489480df7bd1c573d1f4f2dbb..1c61d4e58153ef26d30187a99d766510061846e4 100644 --- a/0103-lxc-fix-code-error-in-conf.c.patch +++ b/0103-lxc-fix-code-error-in-conf.c.patch @@ -1,7 +1,7 @@ -From ca3e9e36f1d6d37ad6688f6550374c26fc44845c Mon Sep 17 00:00:00 2001 +From 3e63b358fcdbfc5d15771aff3e5268fb001c55e1 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 11:14:22 -0400 -Subject: [PATCH 103/138] lxc: fix code error in conf.c +Subject: [PATCH 103/139] lxc: fix code error in conf.c Signed-off-by: LiFeng --- diff --git a/0104-lxc-fix-code-error.patch b/0104-lxc-fix-code-error.patch index 1376c6738b5c3f4132a90c618cf3c65fe2532c62..7ddd485a4281ba9ea01b80ff3968c58f2d843422 100644 --- a/0104-lxc-fix-code-error.patch +++ b/0104-lxc-fix-code-error.patch @@ -1,7 +1,7 @@ -From a66a6ed6220c13187150ab33560df76cdf4e15b6 Mon Sep 17 00:00:00 2001 +From bd464060c85e092316ba18f93ec647f783e41116 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 3 Jun 2019 11:27:34 -0400 -Subject: [PATCH 104/138] lxc: fix code error +Subject: [PATCH 104/139] lxc: fix code error Signed-off-by: tanyifeng Signed-off-by: LiFeng diff --git a/0105-lxc-fix-code-error-warnings.patch b/0105-lxc-fix-code-error-warnings.patch index 8e9af1a9c6cac30d9a06830893187dbb9bc35871..02bf4e619a31887717b622336105e3e4cec76bf6 100644 --- a/0105-lxc-fix-code-error-warnings.patch +++ b/0105-lxc-fix-code-error-warnings.patch @@ -1,7 +1,7 @@ -From 24364817d7ba5efc33de345547e0413df9dc756d Mon Sep 17 00:00:00 2001 +From 0a3af523280a1a0a39c0c368b5c562b3b6e30a6e Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 23:02:50 -0400 -Subject: [PATCH 105/138] lxc: fix code error warnings +Subject: [PATCH 105/139] lxc: fix code error warnings Signed-off-by: LiFeng --- diff --git a/0106-set-timeout-to-1s-for-cmds-send-to-lxc-monitor.patch b/0106-set-timeout-to-1s-for-cmds-send-to-lxc-monitor.patch index cfe7d716d5a5534435764d8b8ee64185ac329dfb..3f449c60d1dee139a50a1553408cf73d64bdc91f 100644 --- a/0106-set-timeout-to-1s-for-cmds-send-to-lxc-monitor.patch +++ b/0106-set-timeout-to-1s-for-cmds-send-to-lxc-monitor.patch @@ -1,7 +1,7 @@ -From a57a384e7d39498a2d70027f67aa9dc1d1db2ea4 Mon Sep 17 00:00:00 2001 +From 973379a46fe3b322769f6d991d3219a54ec7b476 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 6 Jun 2019 22:48:38 -0400 -Subject: [PATCH 106/138] set timeout to 1s for cmds send to [lxc monitor] +Subject: [PATCH 106/139] set timeout to 1s for cmds send to [lxc monitor] Signed-off-by: LiFeng --- diff --git a/0107-add-log-for-failure-of-rename-file.patch b/0107-add-log-for-failure-of-rename-file.patch index ff37d8bca3fe1439e893c79f7782558ad9163bc0..9f77662611633f593d89f7ce8df47758b3ea03a5 100644 --- a/0107-add-log-for-failure-of-rename-file.patch +++ b/0107-add-log-for-failure-of-rename-file.patch @@ -1,7 +1,7 @@ -From 8285ecc2065505e869f92b74934abee2249eaac5 Mon Sep 17 00:00:00 2001 +From c45ff276f829272bc6153723263fad64234c5b1d Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 17 Jun 2019 20:17:37 +0800 -Subject: [PATCH 107/138] add log for failure of rename file +Subject: [PATCH 107/139] add log for failure of rename file 1. add log message of rename operator 2. if rename console file failed, reopen terminal fd diff --git a/0108-check-calloc-input-valid.patch b/0108-check-calloc-input-valid.patch index dc67f735a4b5177ba973c04c8c361a8f024c546f..ffe3041768d8e4002cd43f70d2c25e996bdc5d6b 100644 --- a/0108-check-calloc-input-valid.patch +++ b/0108-check-calloc-input-valid.patch @@ -1,7 +1,7 @@ -From b23823f7acf224be1c4e99dbc8959b7adb1bcc11 Mon Sep 17 00:00:00 2001 +From 2fd043e31d7631c89329ece107313785af140a77 Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 18 Jun 2019 23:16:09 +0800 -Subject: [PATCH 108/138] check calloc input valid +Subject: [PATCH 108/139] check calloc input valid check calloc input valid diff --git a/0109-add-secure-compile-flags-to-lxc.patch b/0109-add-secure-compile-flags-to-lxc.patch index c8017a1befc3f1baec2493edb3d980e1ffcf1854..38b10264a50a80608e4ea1ba4af9f149c142cc14 100644 --- a/0109-add-secure-compile-flags-to-lxc.patch +++ b/0109-add-secure-compile-flags-to-lxc.patch @@ -1,7 +1,7 @@ -From 87d3b15c4b8c4070470f2491c0811cc6e6385de3 Mon Sep 17 00:00:00 2001 +From 8462e7031703987a774e9935bda1af618f1db887 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 20 Jun 2019 17:46:40 +0800 -Subject: [PATCH 109/138] add secure compile flags to lxc +Subject: [PATCH 109/139] add secure compile flags to lxc add secure compile flags to lxc diff --git a/0110-add-doc-for-lxc.patch b/0110-add-doc-for-lxc.patch index 29b7e7a8576d625c41e247e7a3c79603d4aed719..8ed1964ba4ff87c4471ad88c0ef1e4e8b0397c91 100644 --- a/0110-add-doc-for-lxc.patch +++ b/0110-add-doc-for-lxc.patch @@ -1,7 +1,7 @@ -From 1cfa6b9e317c3a259f6960058bd3d0daa1f06b6c Mon Sep 17 00:00:00 2001 +From eb92171582283b603420b8558de8a7c59e5296d9 Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 21 Jun 2019 17:20:43 +0800 -Subject: [PATCH 110/138] add doc for lxc +Subject: [PATCH 110/139] add doc for lxc add doc for lxc diff --git a/0111-lxc-use-safe_strdup-instead-of-strdup.patch b/0111-lxc-use-safe_strdup-instead-of-strdup.patch index 898caa71be77f16fbf2fd1528bb6f1348b939097..13caba43cd7cc01a9814cd180cd5d227ffb2247e 100644 --- a/0111-lxc-use-safe_strdup-instead-of-strdup.patch +++ b/0111-lxc-use-safe_strdup-instead-of-strdup.patch @@ -1,7 +1,7 @@ -From 20567796e28b406e13e0ec745fbbe4860a39a666 Mon Sep 17 00:00:00 2001 +From a5f5a84fc4cab4b266c8b496ebb740010265b14b Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 3 Jul 2019 23:41:15 -0400 -Subject: [PATCH 111/138] lxc: use safe_strdup instead of strdup +Subject: [PATCH 111/139] lxc: use safe_strdup instead of strdup Signed-off-by: LiFeng --- diff --git a/0112-fix-secure-errors.patch b/0112-fix-secure-errors.patch index 57586305435f6ff20735cafc630605b0d240a34c..8ab77a4ba6478748c08a7616fa6568ccf5e2b37e 100644 --- a/0112-fix-secure-errors.patch +++ b/0112-fix-secure-errors.patch @@ -1,7 +1,7 @@ -From 6153cd585089e51b3a6f2f2f982e864a3270e868 Mon Sep 17 00:00:00 2001 +From b20f7a706f5ad40221f765b026902435b61f87a1 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 4 Jul 2019 11:08:26 +0800 -Subject: [PATCH 112/138] fix secure errors +Subject: [PATCH 112/139] fix secure errors 1. use snprintf replace sprintf 2. use malloc replace alloca diff --git a/0113-Malloc-parameter-check-and-judgment.patch b/0113-Malloc-parameter-check-and-judgment.patch index ace508a6cebca3904b95adad9c6345fb60ae03ab..636238c2951568ce1b09f21136f2483ebb992a21 100644 --- a/0113-Malloc-parameter-check-and-judgment.patch +++ b/0113-Malloc-parameter-check-and-judgment.patch @@ -1,7 +1,7 @@ -From f7edf9518a6b11de69d8cfe2c1dbf9bf3a1dacbb Mon Sep 17 00:00:00 2001 +From 5d86635af7e2c38a83c2611b61836ce285b8d8a3 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 4 Jul 2019 12:08:17 +0800 -Subject: [PATCH 113/138] Malloc parameter check and judgment +Subject: [PATCH 113/139] Malloc parameter check and judgment Signed-off-by: wujing Signed-off-by: LiFeng diff --git a/0114-lxc-fix-code-errors.patch b/0114-lxc-fix-code-errors.patch index f91b579f1529723d5ef0c9b714f16417b9230b47..3493e5c2a5dfffd50f0c080b67b997a16810db57 100644 --- a/0114-lxc-fix-code-errors.patch +++ b/0114-lxc-fix-code-errors.patch @@ -1,7 +1,7 @@ -From 0abcc74b3e18615af1ce0659a496f7a388efe8ae Mon Sep 17 00:00:00 2001 +From 13cb946a0db26f50c017d7be52c091f0d3c82ae1 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 4 Jul 2019 05:10:00 -0400 -Subject: [PATCH 114/138] lxc: fix code errors +Subject: [PATCH 114/139] lxc: fix code errors Signed-off-by: LiFeng --- diff --git a/0115-fix-compile-error-on-ubuntu.patch b/0115-fix-compile-error-on-ubuntu.patch index 8cba5074efb2effc9e5e8f4c2f85e8642864fa4f..279572490dbbbea2b0074effc905b1687b59fb5f 100644 --- a/0115-fix-compile-error-on-ubuntu.patch +++ b/0115-fix-compile-error-on-ubuntu.patch @@ -1,7 +1,7 @@ -From 5ac103afa3420eb2d6c74c1502e274812d186db0 Mon Sep 17 00:00:00 2001 +From 6bffa764f1a5f78a9c0fb4beb024bd1b26eea5ce Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Jul 2019 17:42:00 +0800 -Subject: [PATCH 115/138] fix compile error on ubuntu +Subject: [PATCH 115/139] fix compile error on ubuntu fix compile error on ubuntu diff --git a/0116-lxc-set-base-cgroup-path-to.patch b/0116-lxc-set-base-cgroup-path-to.patch index 6aac9a6762f4a617d4c9a775bbd5d32183074c2e..743234405d2f4d9fa9fda69662913511960e4565 100644 --- a/0116-lxc-set-base-cgroup-path-to.patch +++ b/0116-lxc-set-base-cgroup-path-to.patch @@ -1,7 +1,7 @@ -From 09e9d64eda0979b581e6941f7152643909a9a95c Mon Sep 17 00:00:00 2001 +From dd457c767956157e697ac3b384399ff71ed0673d Mon Sep 17 00:00:00 2001 From: liuhao Date: Wed, 19 Jun 2019 16:48:50 +0800 -Subject: [PATCH 116/138] lxc: set base cgroup path to '/' +Subject: [PATCH 116/139] lxc: set base cgroup path to '/' reason:base cgroup may be started with /system.slice when cg_hybrid_init read /proc/1/cgroup on host, and cgroup init will set all containers diff --git a/0117-pupulate-device-with-dir-mode-750-and-set-uid-gid.patch b/0117-pupulate-device-with-dir-mode-750-and-set-uid-gid.patch index 0494506c0ccd6012b1f8b504d693a65b6709a1cf..cb0b46e67bbcc77579285dfdd3dabd9a0a6a2aaf 100644 --- a/0117-pupulate-device-with-dir-mode-750-and-set-uid-gid.patch +++ b/0117-pupulate-device-with-dir-mode-750-and-set-uid-gid.patch @@ -1,7 +1,7 @@ -From 3d13f72c92b0a40b97cfd708a56d9abaad9c1610 Mon Sep 17 00:00:00 2001 +From a1c8c0461a87143e6bb9fdc8fabcf17811e94296 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 31 Jul 2019 05:24:11 -0400 -Subject: [PATCH 117/138] pupulate device with dir mode 750 and set uid/gid +Subject: [PATCH 117/139] pupulate device with dir mode 750 and set uid/gid Signed-off-by: LiFeng --- diff --git a/0118-fix-sscanf-return-value-check.patch b/0118-fix-sscanf-return-value-check.patch index 4c469f9d96f25a706cf2c01f551b2b786c45ec4f..8496bacd081af6d8d6d0c1e7058bd7c0d074e7e4 100644 --- a/0118-fix-sscanf-return-value-check.patch +++ b/0118-fix-sscanf-return-value-check.patch @@ -1,7 +1,7 @@ -From 5db3f150f53867f3b5e55bd3dd6b5b3f7d3916ab Mon Sep 17 00:00:00 2001 +From 703eeab29a903faa239be620fa3711e7d586e078 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 2 Sep 2019 06:24:07 -0400 -Subject: [PATCH 118/138] fix sscanf return value check +Subject: [PATCH 118/139] fix sscanf return value check Signed-off-by: LiFeng --- diff --git a/0119-remove-unuse-binary.patch b/0119-remove-unuse-binary.patch index 37ce44d2034a369e1d98c7b2f936e0504a2c67f9..f5d3feecb0a016fd26a729139ad3d790d2071ec0 100644 --- a/0119-remove-unuse-binary.patch +++ b/0119-remove-unuse-binary.patch @@ -1,7 +1,7 @@ -From 8a67511e42e7c6ebeb28df2feeb8ee0774995822 Mon Sep 17 00:00:00 2001 +From 4234dc19cd6e7922cf8220674b27e729d733ab37 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Wed, 4 Sep 2019 18:01:39 +0800 -Subject: [PATCH 119/138] remove unuse binary +Subject: [PATCH 119/139] remove unuse binary Signed-off-by: LiuHao --- diff --git a/0120-remove-unuse-unmount-namespace.patch b/0120-remove-unuse-unmount-namespace.patch index 414d08e09b5f95d5862d3bf633d4900132bb6133..d2befffe38111ad292937230b0d72cfa2ea3e7ec 100644 --- a/0120-remove-unuse-unmount-namespace.patch +++ b/0120-remove-unuse-unmount-namespace.patch @@ -1,7 +1,7 @@ -From 762e925625752a52c30dd55d28b210c659869f9c Mon Sep 17 00:00:00 2001 +From 72c3b292ff9a56c7ab5b98dcf2587b158be93628 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 5 Sep 2019 11:48:57 +0800 -Subject: [PATCH 120/138] remove unuse unmount-namespace +Subject: [PATCH 120/139] remove unuse unmount-namespace Signed-off-by: LiuHao --- diff --git a/0121-optimize-log-when-root-path-is-invalid.patch b/0121-optimize-log-when-root-path-is-invalid.patch index a50ea649a2d5c6be18fb48b84ca6776c5b7bca4d..2dfd5a22b76342b5096a5a757abb5a9a533b3f47 100644 --- a/0121-optimize-log-when-root-path-is-invalid.patch +++ b/0121-optimize-log-when-root-path-is-invalid.patch @@ -1,7 +1,7 @@ -From 3decb2d204e100397d97a32495d547ed0685756a Mon Sep 17 00:00:00 2001 +From 522a7231efdb304cd84443b1211cddfd0b8c80b3 Mon Sep 17 00:00:00 2001 From: TanYifeng Date: Sat, 21 Sep 2019 06:19:25 -0400 -Subject: [PATCH 121/138] optimize log when root path is invalid +Subject: [PATCH 121/139] optimize log when root path is invalid Signed-off-by: TanYifeng --- diff --git a/0122-lxc-fix-code-reivew-errors.patch b/0122-lxc-fix-code-reivew-errors.patch index 6ee5f01cfe9be317e2f1a4b7d705f9e7183e81ca..98cf5cf2bdff6f3361b12289a5e4a91e5fe4b8cf 100644 --- a/0122-lxc-fix-code-reivew-errors.patch +++ b/0122-lxc-fix-code-reivew-errors.patch @@ -1,7 +1,7 @@ -From afce33825ae2368d613617d3483000c7dc785930 Mon Sep 17 00:00:00 2001 +From 312d0ba4aa928b8ee666fbe1eb95c997b30d731e Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 26 Sep 2019 07:47:19 -0400 -Subject: [PATCH 122/138] lxc: fix code reivew errors +Subject: [PATCH 122/139] lxc: fix code reivew errors Signed-off-by: LiFeng --- diff --git a/0123-in-accordance-with-hook-spec-in-oci.patch b/0123-in-accordance-with-hook-spec-in-oci.patch index 0810c4b01a8715df2455470b4afd73aa3b7a5a63..bbb70881504935fd47b33e9e06bfa41ef21a27df 100644 --- a/0123-in-accordance-with-hook-spec-in-oci.patch +++ b/0123-in-accordance-with-hook-spec-in-oci.patch @@ -1,7 +1,7 @@ -From 41a5e567cf02b18bf623e439a2457fb3ce95d8fb Mon Sep 17 00:00:00 2001 +From 40e603be55ed03d76e9ef1d82b57c05f15125f2c Mon Sep 17 00:00:00 2001 From: LiuHao Date: Mon, 25 Nov 2019 21:15:40 +0800 -Subject: [PATCH 123/138] in accordance with hook spec in oci +Subject: [PATCH 123/139] in accordance with hook spec in oci Signed-off-by: LiuHao --- diff --git a/0124-lxc-close-maincmd-fd-before-destroy-cgroup.patch b/0124-lxc-close-maincmd-fd-before-destroy-cgroup.patch index a44462c53013cfa26a50f5b940da506ded194188..b6e5029434454011633eadd14d5c714f80399147 100644 --- a/0124-lxc-close-maincmd-fd-before-destroy-cgroup.patch +++ b/0124-lxc-close-maincmd-fd-before-destroy-cgroup.patch @@ -1,7 +1,7 @@ -From 754525a09827844e9b309c659f745509c3ae4ebc Mon Sep 17 00:00:00 2001 +From 3fed6c510fa597be32327e3e5aa2beb43a025553 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 27 Nov 2019 22:33:46 -0500 -Subject: [PATCH 124/138] lxc: close maincmd fd before destroy cgroup +Subject: [PATCH 124/139] lxc: close maincmd fd before destroy cgroup Signed-off-by: LiFeng --- diff --git a/0125-lxc-fix-strcat-bug-in-cleanpath.patch b/0125-lxc-fix-strcat-bug-in-cleanpath.patch index 15663d54bd6c1bfbfb06a2dc3c1b47a5c445c842..5408c136b50d223355b7d968288e886db727d498 100644 --- a/0125-lxc-fix-strcat-bug-in-cleanpath.patch +++ b/0125-lxc-fix-strcat-bug-in-cleanpath.patch @@ -1,7 +1,7 @@ -From e9481f7fe1bdd47b1df75c96654c88a606730a2f Mon Sep 17 00:00:00 2001 +From 16243e365367031f60e8ad4cf89f3014e999066e Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 29 Nov 2019 22:16:05 -0500 -Subject: [PATCH 125/138] lxc: fix strcat bug in cleanpath +Subject: [PATCH 125/139] lxc: fix strcat bug in cleanpath Signed-off-by: LiFeng --- diff --git a/0126-add-user-option-for-lxc-attach.patch b/0126-add-user-option-for-lxc-attach.patch index 505e2e8a3c6693a60103fc197f6b76fe45e714c8..52faf361f232355b19089682aafa49c13d49e4b2 100644 --- a/0126-add-user-option-for-lxc-attach.patch +++ b/0126-add-user-option-for-lxc-attach.patch @@ -1,7 +1,7 @@ -From cab7334deeb38b530bdb37e52b5f3a6dc58562d7 Mon Sep 17 00:00:00 2001 +From 7c3846e5c3e834821454766a45bced3e69bdfaab Mon Sep 17 00:00:00 2001 From: wujing Date: Wed, 30 Oct 2019 18:41:02 +0800 -Subject: [PATCH 126/138] add user option for lxc-attach +Subject: [PATCH 126/139] add user option for lxc-attach Signed-off-by: wujing --- diff --git a/0127-log-only-write-size-begin-if-buffer-is-full.patch b/0127-log-only-write-size-begin-if-buffer-is-full.patch index fcb06b3d1b07b6e4652577c23bbabc51e0c03b6e..9ca29a13710fb15278288f17b6ee77f9b9dea924 100644 --- a/0127-log-only-write-size-begin-if-buffer-is-full.patch +++ b/0127-log-only-write-size-begin-if-buffer-is-full.patch @@ -1,7 +1,7 @@ -From 396928f93365c2eb6f19a3d0d87394fcd43dcef0 Mon Sep 17 00:00:00 2001 +From 8eee379351a1c81f41c62c6416c29bb7b6af5968 Mon Sep 17 00:00:00 2001 From: TanYifeng Date: Tue, 3 Dec 2019 22:43:25 -0500 -Subject: [PATCH 127/138] log: only write (size - begin) if buffer is full +Subject: [PATCH 127/139] log: only write (size - begin) if buffer is full Signed-off-by: TanYifeng --- diff --git a/0128-link-proc-mounts-to-etc-mtab.patch b/0128-link-proc-mounts-to-etc-mtab.patch index f9f7559f22db2cd01ab7142449a819823853c99d..3d87437381794eac9f165f262f2ce516f994d1a8 100644 --- a/0128-link-proc-mounts-to-etc-mtab.patch +++ b/0128-link-proc-mounts-to-etc-mtab.patch @@ -1,7 +1,7 @@ -From a2c36d77465b337a2172ca7d1fee3b4918eaf550 Mon Sep 17 00:00:00 2001 +From a9e3f86bc53c0b10877bca2ab6b6de8451213cbe Mon Sep 17 00:00:00 2001 From: wujing Date: Tue, 10 Dec 2019 21:28:47 +0800 -Subject: [PATCH 128/138] link /proc/mounts to /etc/mtab +Subject: [PATCH 128/139] link /proc/mounts to /etc/mtab Signed-off-by: wujing --- diff --git a/0129-cgfsng-add-retry-for-enter-cgroup.patch b/0129-cgfsng-add-retry-for-enter-cgroup.patch index 5a88105a009c829d2bb7d6ebfa008a3850daec7d..13a8c767cd60079ee1c12c4250a0b1abd2211ffd 100644 --- a/0129-cgfsng-add-retry-for-enter-cgroup.patch +++ b/0129-cgfsng-add-retry-for-enter-cgroup.patch @@ -1,7 +1,7 @@ -From aed5ecb69d2256933b431eac01e83e69bb72c753 Mon Sep 17 00:00:00 2001 +From 708f4741d94b8e6e3e1df481aec76e2556b0cc5d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 10 Dec 2019 05:40:20 -0500 -Subject: [PATCH 129/138] cgfsng: add retry for enter cgroup +Subject: [PATCH 129/139] cgfsng: add retry for enter cgroup Signed-off-by: LiFeng --- diff --git a/0130-fix-snprintf-create-abstract-socket-name-bug.patch b/0130-fix-snprintf-create-abstract-socket-name-bug.patch index e71d09e436eb42840435117036f9b064584d193f..04cbd202a55f1981daf59f1e5270ab0facc60bc5 100644 --- a/0130-fix-snprintf-create-abstract-socket-name-bug.patch +++ b/0130-fix-snprintf-create-abstract-socket-name-bug.patch @@ -1,7 +1,7 @@ -From 54ca113d0c93b819ed20edf83ef85dccd584c87a Mon Sep 17 00:00:00 2001 +From f3ca7bf8732a2afce69a9ecfaf942cbfb56503c2 Mon Sep 17 00:00:00 2001 From: wujing Date: Tue, 17 Dec 2019 21:24:24 +0800 -Subject: [PATCH 130/138] fix snprintf create abstract socket name bug +Subject: [PATCH 130/139] fix snprintf create abstract socket name bug Signed-off-by: wujing --- diff --git a/0131-fix-commands-and-terminal-memory-leak-bug.patch b/0131-fix-commands-and-terminal-memory-leak-bug.patch index 49baeb98d9de6d01e8486f3ec3eb4fd0ec206a31..ea377e46689338e01b8d9124033f72f2e7a66700 100644 --- a/0131-fix-commands-and-terminal-memory-leak-bug.patch +++ b/0131-fix-commands-and-terminal-memory-leak-bug.patch @@ -1,7 +1,7 @@ -From 6e5ce4f3e23cb7cb5ccfba058b6aca8829e2fa87 Mon Sep 17 00:00:00 2001 +From 35caf7a1f7ea9fb577254965e834b78d46f74e23 Mon Sep 17 00:00:00 2001 From: wujing Date: Wed, 18 Dec 2019 15:44:19 +0800 -Subject: [PATCH 131/138] fix commands and terminal memory leak bug +Subject: [PATCH 131/139] fix commands and terminal memory leak bug Signed-off-by: wujing --- diff --git a/0132-lxc-fix-bug-in-cgroup-parent.patch b/0132-lxc-fix-bug-in-cgroup-parent.patch index 6631b1133157a917db2a017fbf35948ac9b6dabc..05dc5aa6c7d8dffb6fd6829e311d5bb7a6192d18 100644 --- a/0132-lxc-fix-bug-in-cgroup-parent.patch +++ b/0132-lxc-fix-bug-in-cgroup-parent.patch @@ -1,7 +1,7 @@ -From 62b1de26a3b8bafbe3e3e2da56176dc7c82e4e25 Mon Sep 17 00:00:00 2001 +From b71bd40c8f5bc8615ead8b95e142645174049757 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 18 Dec 2019 06:00:58 -0500 -Subject: [PATCH 132/138] lxc: fix bug in cgroup-parent +Subject: [PATCH 132/139] lxc: fix bug in cgroup-parent Signed-off-by: LiFeng --- diff --git a/0133-lxc-fix-bug-in-cgfsng.patch b/0133-lxc-fix-bug-in-cgfsng.patch index 227180d3db2bb5cf86794dfefd6389ae69bcb119..72c6ba0643de8ae7fb82db16a309539236d1e181 100644 --- a/0133-lxc-fix-bug-in-cgfsng.patch +++ b/0133-lxc-fix-bug-in-cgfsng.patch @@ -1,7 +1,7 @@ -From ec306b448b42349c5c62e1639b25d257db438d7d Mon Sep 17 00:00:00 2001 +From 02a2ab6454fe0d4012d9394599b0882fca92a91a Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 18 Dec 2019 09:01:25 -0500 -Subject: [PATCH 133/138] lxc: fix bug in cgfsng +Subject: [PATCH 133/139] lxc: fix bug in cgfsng Signed-off-by: LiFeng --- diff --git a/0134-lxc-do-cpuset-same-as-runc.patch b/0134-lxc-do-cpuset-same-as-runc.patch index 49b912edd8a71e21c7d0afa535988644a25202a9..51e78cc506364c8533a6d8f94e9e5713582ad2cd 100644 --- a/0134-lxc-do-cpuset-same-as-runc.patch +++ b/0134-lxc-do-cpuset-same-as-runc.patch @@ -1,7 +1,7 @@ -From 1118dbb609b83fcca6871e17a11de0752ef3f9d7 Mon Sep 17 00:00:00 2001 +From e65cb8ae214d26225acb853bfb628b1b7e0a825f Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 18 Dec 2019 22:37:08 -0500 -Subject: [PATCH 134/138] lxc: do cpuset same as runc +Subject: [PATCH 134/139] lxc: do cpuset same as runc Signed-off-by: LiFeng --- diff --git a/0135-lxc-fix-code-warnings-for-cgfsng.c.patch b/0135-lxc-fix-code-warnings-for-cgfsng.c.patch index a04cc0280621ee803519017f6c506ce37da81ad4..9b654eed8dc9ae546a4ce3eecbfcd8bf1ba814be 100644 --- a/0135-lxc-fix-code-warnings-for-cgfsng.c.patch +++ b/0135-lxc-fix-code-warnings-for-cgfsng.c.patch @@ -1,7 +1,7 @@ -From 6c1e2e9db0e6f6cf685b60d62a74ba3994b0a333 Mon Sep 17 00:00:00 2001 +From 5585a4c925088485b0d71b95c942973c31398154 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 23 Dec 2019 03:20:14 -0500 -Subject: [PATCH 135/138] lxc: fix code warnings for cgfsng.c +Subject: [PATCH 135/139] lxc: fix code warnings for cgfsng.c Signed-off-by: LiFeng --- diff --git a/0136-lxc-fix-retry-bug-in-cgroup.patch b/0136-lxc-fix-retry-bug-in-cgroup.patch index 2bcbf11423e4b6e68d32f94b2fcba359de890e0a..6af5ddd8043779399ee4cbd1fa5b395202ac7bcc 100644 --- a/0136-lxc-fix-retry-bug-in-cgroup.patch +++ b/0136-lxc-fix-retry-bug-in-cgroup.patch @@ -1,7 +1,7 @@ -From 77e924659f1a1674f5c2017f4dd03b9d94f67ee3 Mon Sep 17 00:00:00 2001 +From dc42e8b5cfff32253cf1e1152814b8a2da77c8c0 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 28 Dec 2019 20:12:57 -0500 -Subject: [PATCH 136/138] lxc: fix retry bug in cgroup +Subject: [PATCH 136/139] lxc: fix retry bug in cgroup Signed-off-by: LiFeng --- diff --git a/0137-lxc-fix-bug-in-read-proc.patch b/0137-lxc-fix-bug-in-read-proc.patch index 1d2f49dfb2efae8d3dcc9d0fc9e4f83dc0cf146d..1d646f973cf22e057ab1e06d6b0a7f0a0d4022aa 100644 --- a/0137-lxc-fix-bug-in-read-proc.patch +++ b/0137-lxc-fix-bug-in-read-proc.patch @@ -1,7 +1,7 @@ -From 3a68cc1e0500c6643d281f4d67b8c6a61708eb4a Mon Sep 17 00:00:00 2001 +From b0164257a8f7e815e43fd6e586e1f30ee3ebd1dd Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 30 Dec 2019 04:50:28 -0500 -Subject: [PATCH 137/138] lxc: fix bug in read proc +Subject: [PATCH 137/139] lxc: fix bug in read proc Signed-off-by: LiFeng --- diff --git a/0138-resize-implement-resize-function-in-exec-start.patch b/0138-resize-implement-resize-function-in-exec-start.patch index 2e958625e180eaa73837ea5caf3adf4010bdfcf8..0a256d69494ff53cfe6b14d7d4ce70089713c147 100644 --- a/0138-resize-implement-resize-function-in-exec-start.patch +++ b/0138-resize-implement-resize-function-in-exec-start.patch @@ -1,7 +1,7 @@ -From 3690e3e4ced8378108888ff2c15aeecfc650b974 Mon Sep 17 00:00:00 2001 +From 29c845fe630204d35b300241a47ccd4525d315f9 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 29 Nov 2019 22:12:10 -0500 -Subject: [PATCH 138/138] resize: implement resize function in exec/start +Subject: [PATCH 138/139] resize: implement resize function in exec/start Signed-off-by: LiFeng --- diff --git a/0139-lxc-fix-get-cgroup-path-by-config-instead-of-cmd.patch b/0139-lxc-fix-get-cgroup-path-by-config-instead-of-cmd.patch new file mode 100644 index 0000000000000000000000000000000000000000..42aa76bb024544932f16f2ac91125f11c728ac8e --- /dev/null +++ b/0139-lxc-fix-get-cgroup-path-by-config-instead-of-cmd.patch @@ -0,0 +1,318 @@ +From b98cb4cc297ab4b7a6da6b9e7096abf1a06656d4 Mon Sep 17 00:00:00 2001 +From: LiFeng +Date: Wed, 15 Jan 2020 03:55:27 -0500 +Subject: [PATCH 139/139] lxc: fix get cgroup path by config instead of cmd + +Signed-off-by: LiFeng +--- + src/lxc/attach.c | 2 +- + src/lxc/cgroups/cgfsng.c | 26 +++++++++++++------------- + src/lxc/cgroups/cgroup.c | 6 +++--- + src/lxc/cgroups/cgroup.h | 4 ++-- + src/lxc/criu.c | 4 ++-- + src/lxc/freezer.c | 12 ++++++------ + src/lxc/lxc.h | 4 ++-- + src/lxc/lxccontainer.c | 8 ++++---- + src/lxc/start.c | 6 +++--- + src/tests/cgpath.c | 2 +- + 10 files changed, 37 insertions(+), 37 deletions(-) + +diff --git a/src/lxc/attach.c b/src/lxc/attach.c +index 03a7646..2061b96 100644 +--- a/src/lxc/attach.c ++++ b/src/lxc/attach.c +@@ -1477,7 +1477,7 @@ int lxc_attach(const char *name, const char *lxcpath, const char *suffix, + if (options->attach_flags & LXC_ATTACH_MOVE_TO_CGROUP) { + struct cgroup_ops *cgroup_ops; + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(conf); + if (!cgroup_ops) + goto on_error; + +diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c +index ed08f10..ae15449 100644 +--- a/src/lxc/cgroups/cgfsng.c ++++ b/src/lxc/cgroups/cgfsng.c +@@ -1799,10 +1799,12 @@ __cgfsng_ops static int cgfsng_get(struct cgroup_ops *ops, const char *filename, + if (p) + *p = '\0'; + +- path = lxc_cmd_get_cgroup_path(name, lxcpath, controller); +- /* not running */ +- if (!path) ++ const char *ori_path = ops->get_cgroup(ops, controller, true); ++ if (ori_path == NULL) { ++ ERROR("Failed to get cgroup path:%s", controller); + return -1; ++ } ++ path = safe_strdup(ori_path); + + h = get_hierarchy(ops, controller); + if (h) { +@@ -1838,10 +1840,12 @@ __cgfsng_ops static int cgfsng_set(struct cgroup_ops *ops, + if (p) + *p = '\0'; + +- path = lxc_cmd_get_cgroup_path(name, lxcpath, controller); +- /* not running */ +- if (!path) ++ const char *ori_path = ops->get_cgroup(ops, controller, true); ++ if (ori_path == NULL) { ++ ERROR("Failed to get cgroup path:%s", controller); + return -1; ++ } ++ path = safe_strdup(ori_path); + + h = get_hierarchy(ops, controller); + if (h) { +@@ -2484,17 +2488,13 @@ static bool cg_init(struct cgroup_ops *ops) + return cg_hybrid_init(ops); + } + +-__cgfsng_ops static bool cgfsng_data_init(struct cgroup_ops *ops, struct lxc_handler *handler) ++__cgfsng_ops static bool cgfsng_data_init(struct cgroup_ops *ops, struct lxc_conf *conf) + { + const char *cgroup_pattern = NULL; + char *container_cgroup = NULL; + char *tmp = NULL; +- struct lxc_conf *conf = NULL; + size_t len; + +- if (handler) +- conf = handler->conf; +- + /* copy system-wide cgroup information */ + cgroup_pattern = lxc_global_config_value("lxc.cgroup.pattern"); + if (!cgroup_pattern) { +@@ -2508,10 +2508,10 @@ __cgfsng_ops static bool cgfsng_data_init(struct cgroup_ops *ops, struct lxc_han + if (conf) { + if (conf->cgroup_meta.dir) + tmp = lxc_string_join("/", (const char *[]) { +- conf->cgroup_meta.dir, handler->name, NULL ++ conf->cgroup_meta.dir, conf->name, NULL + }, false); + else +- tmp = lxc_string_replace("%n", handler->name, ops->cgroup_pattern); ++ tmp = lxc_string_replace("%n", conf->name, ops->cgroup_pattern); + if (!tmp) { + ERROR("Failed expanding cgroup name pattern"); + return false; +diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c +index 8d559be..bca00d5 100644 +--- a/src/lxc/cgroups/cgroup.c ++++ b/src/lxc/cgroups/cgroup.c +@@ -40,17 +40,17 @@ lxc_log_define(cgroup, lxc); + + extern struct cgroup_ops *cgfsng_ops_init(int errfd); + +-struct cgroup_ops *cgroup_init(struct lxc_handler *handler) ++struct cgroup_ops *cgroup_init(struct lxc_conf *conf) + { + struct cgroup_ops *cgroup_ops; + +- cgroup_ops = cgfsng_ops_init(handler ? handler->conf->errpipe[1] : -1); ++ cgroup_ops = cgfsng_ops_init(conf ? conf->errpipe[1] : -1); + if (!cgroup_ops) { + ERROR("Failed to initialize cgroup driver"); + return NULL; + } + +- if (!cgroup_ops->data_init(cgroup_ops, handler)) ++ if (!cgroup_ops->data_init(cgroup_ops, conf)) + return NULL; + + TRACE("Initialized cgroup driver %s", cgroup_ops->driver); +diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h +index edbb1e3..935b4d3 100644 +--- a/src/lxc/cgroups/cgroup.h ++++ b/src/lxc/cgroups/cgroup.h +@@ -125,7 +125,7 @@ struct cgroup_ops { + */ + cgroup_layout_t cgroup_layout; + +- bool (*data_init)(struct cgroup_ops *ops, struct lxc_handler *handler); ++ bool (*data_init)(struct cgroup_ops *ops, struct lxc_conf *conf); + bool (*destroy)(struct cgroup_ops *ops, struct lxc_handler *handler); + bool (*payload_create)(struct cgroup_ops *ops, struct lxc_handler *handler); + bool (*payload_enter)(struct cgroup_ops *ops, pid_t pid); +@@ -148,7 +148,7 @@ struct cgroup_ops { + int (*nrtasks)(struct cgroup_ops *ops); + }; + +-extern struct cgroup_ops *cgroup_init(struct lxc_handler *handler); ++extern struct cgroup_ops *cgroup_init(struct lxc_conf *conf); + extern void cgroup_exit(struct cgroup_ops *ops); + + extern void prune_init_scope(char *cg); +diff --git a/src/lxc/criu.c b/src/lxc/criu.c +index 5c77979..700a3e4 100644 +--- a/src/lxc/criu.c ++++ b/src/lxc/criu.c +@@ -970,7 +970,7 @@ static void do_restore(struct lxc_container *c, int status_pipe, struct migrate_ + if (lxc_init(c->name, handler) < 0) + goto out; + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(c->lxc_conf); + if (!cgroup_ops) + goto out_fini_handler; + handler->cgroup_ops = cgroup_ops; +@@ -1270,7 +1270,7 @@ static bool do_dump(struct lxc_container *c, char *mode, struct migrate_opts *op + + close(criuout[0]); + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(c->lxc_conf); + if (!cgroup_ops) { + ERROR("failed to cgroup_init()"); + _exit(EXIT_FAILURE); +diff --git a/src/lxc/freezer.c b/src/lxc/freezer.c +index fc3622a..d5fad75 100644 +--- a/src/lxc/freezer.c ++++ b/src/lxc/freezer.c +@@ -45,7 +45,7 @@ + + lxc_log_define(freezer, lxc); + +-static int do_freeze_thaw(bool freeze, const char *name, const char *lxcpath) ++static int do_freeze_thaw(bool freeze, struct lxc_conf *conf, const char *name, const char *lxcpath) + { + int ret; + char v[100]; +@@ -54,7 +54,7 @@ static int do_freeze_thaw(bool freeze, const char *name, const char *lxcpath) + size_t state_len = 6; + lxc_state_t new_state = freeze ? FROZEN : THAWED; + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(conf); + if (!cgroup_ops) + return -1; + +@@ -88,14 +88,14 @@ static int do_freeze_thaw(bool freeze, const char *name, const char *lxcpath) + } + } + +-int lxc_freeze(const char *name, const char *lxcpath) ++int lxc_freeze(struct lxc_conf *conf, const char *name, const char *lxcpath) + { + lxc_cmd_serve_state_clients(name, lxcpath, FREEZING); + lxc_monitor_send_state(name, FREEZING, lxcpath); +- return do_freeze_thaw(true, name, lxcpath); ++ return do_freeze_thaw(true, conf, name, lxcpath); + } + +-int lxc_unfreeze(const char *name, const char *lxcpath) ++int lxc_unfreeze(struct lxc_conf *conf, const char *name, const char *lxcpath) + { +- return do_freeze_thaw(false, name, lxcpath); ++ return do_freeze_thaw(false, conf, name, lxcpath); + } +diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h +index 5df5080..bd0d373 100644 +--- a/src/lxc/lxc.h ++++ b/src/lxc/lxc.h +@@ -82,14 +82,14 @@ extern int lxc_monitor_close(int fd); + * @name : the container name + * Returns 0 on success, < 0 otherwise + */ +-extern int lxc_freeze(const char *name, const char *lxcpath); ++extern int lxc_freeze(struct lxc_conf *conf, const char *name, const char *lxcpath); + + /* + * Unfreeze all previously frozen tasks. + * @name : the name of the container + * Return 0 on success, < 0 otherwise + */ +-extern int lxc_unfreeze(const char *name, const char *lxcpath); ++extern int lxc_unfreeze(struct lxc_conf *conf, const char *name, const char *lxcpath); + + /* + * Retrieve the container state +diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c +index 7ef57f0..e5a82f3 100644 +--- a/src/lxc/lxccontainer.c ++++ b/src/lxc/lxccontainer.c +@@ -516,7 +516,7 @@ static bool do_lxcapi_freeze(struct lxc_container *c) + if (!c) + return false; + +- ret = lxc_freeze(c->name, c->config_path); ++ ret = lxc_freeze(c->lxc_conf, c->name, c->config_path); + if (ret < 0) + return false; + +@@ -532,7 +532,7 @@ static bool do_lxcapi_unfreeze(struct lxc_container *c) + if (!c) + return false; + +- ret = lxc_unfreeze(c->name, c->config_path); ++ ret = lxc_unfreeze(c->lxc_conf, c->name, c->config_path); + if (ret < 0) + return false; + +@@ -3455,7 +3455,7 @@ static bool do_lxcapi_set_cgroup_item(struct lxc_container *c, const char *subsy + if (is_stopped(c)) + return false; + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(c->lxc_conf); + if (!cgroup_ops) + return false; + +@@ -3479,7 +3479,7 @@ static int do_lxcapi_get_cgroup_item(struct lxc_container *c, const char *subsys + if (is_stopped(c)) + return -1; + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(c->lxc_conf); + if (!cgroup_ops) + return -1; + +diff --git a/src/lxc/start.c b/src/lxc/start.c +index c9bae65..0af2e92 100644 +--- a/src/lxc/start.c ++++ b/src/lxc/start.c +@@ -919,7 +919,7 @@ int lxc_init(const char *name, struct lxc_handler *handler) + } + TRACE("Chowned console"); + +- handler->cgroup_ops = cgroup_init(handler); ++ handler->cgroup_ops = cgroup_init(conf); + if (!handler->cgroup_ops) { + ERROR("Failed to initialize cgroup driver"); + goto out_delete_terminal; +@@ -2680,7 +2680,7 @@ static struct lxc_handler *lxc_init_clean_handler(char *name, char *lxcpath, str + handler->name = name; + handler->exit_code = -1; /* isulad: record exit code of container */ + +- handler->cgroup_ops = cgroup_init(handler); ++ handler->cgroup_ops = cgroup_init(conf); + if (!handler->cgroup_ops) { + ERROR("Failed to initialize cgroup driver"); + goto on_error; +@@ -2729,7 +2729,7 @@ static struct lxc_handler *lxc_init_pids_handler(char *name, char *lxcpath, stru + handler->name = name; + handler->exit_code = -1; /* isulad: record exit code of container */ + +- handler->cgroup_ops = cgroup_init(handler); ++ handler->cgroup_ops = cgroup_init(conf); + if (!handler->cgroup_ops) { + ERROR("Failed to initialize cgroup driver"); + goto on_error; +diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c +index fa8d476..8f4c19f 100644 +--- a/src/tests/cgpath.c ++++ b/src/tests/cgpath.c +@@ -80,7 +80,7 @@ static int test_running_container(const char *lxcpath, + goto err3; + } + +- cgroup_ops = cgroup_init(NULL); ++ cgroup_ops = cgroup_init(c->lxc_conf); + if (!cgroup_ops) + goto err3; + +-- +1.8.3.1 + diff --git a/lxc.spec b/lxc.spec index a5efeb6872f92ad4f4e1f31ea1c6d0231c30f3d2..95834a68da4917abfa1d381087ade9cbb8b63d42 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 20200109 +%global _release 20200214 %global debug_package %{nil} Name: lxc @@ -147,12 +147,17 @@ Patch9137: 0135-lxc-fix-code-warnings-for-cgfsng.c.patch Patch9138: 0136-lxc-fix-retry-bug-in-cgroup.patch Patch9139: 0137-lxc-fix-bug-in-read-proc.patch Patch9140: 0138-resize-implement-resize-function-in-exec-start.patch +Patch9141: 0139-lxc-fix-get-cgroup-path-by-config-instead-of-cmd.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) BuildRequires: libcap libcap-devel libselinux-devel yajl yajl-devel BuildRequires: pkgconfig(bash-completion) +Requires: lxc-libs = 3.0.3-%{release} + +%package libs +Summary: Runtime library files for %{name} Requires: rsync Requires(post): systemd Requires(preun): systemd @@ -160,8 +165,12 @@ Requires(postun): systemd Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Provides: lxc-libs -Obsoletes: lxc-libs +%description libs +Linux Resource Containers provide process and resource isolation without the +overhead of full virtualization. + +The %{name}-libs package contains libraries for running %{name} applications. + %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/lxc-3.0.3} @@ -257,6 +266,8 @@ make check %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/lxc +%files libs +%defattr(-,root,root) %{_libdir}/liblxc.so %{_libdir}/liblxc.so.* %{_libdir}/%{name} @@ -266,10 +277,10 @@ make check %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/default.conf -%license COPYING %dir %{_pkgdocdir} %{_pkgdocdir}/AUTHORS %{_pkgdocdir}/README +%license COPYING %{_unitdir}/%{name}.service %{_unitdir}/%{name}@.service %{_unitdir}/%{name}-net.service @@ -299,5 +310,7 @@ make check %{_mandir}/*/man7/%{name}* %changelog +* Thu Feb 14 2020 openEuler Buildteam - 3.0.3-20200214 +- make lxc-libs package * Thu Dec 19 2019 openEuler Buildteam - 3.0.3-20191218 - Package init diff --git a/series.conf b/series.conf index 8361e71ba9974f14a872646044c01db8c2ac3f03..f3901a6f1774d4e5e9fc5d17df8cfd3834b4be45 100644 --- a/series.conf +++ b/series.conf @@ -137,3 +137,4 @@ lxc-CVE-2019-5736-runC-rexec-callers-as-memfd.patch 0136-lxc-fix-retry-bug-in-cgroup.patch 0137-lxc-fix-bug-in-read-proc.patch 0138-resize-implement-resize-function-in-exec-start.patch +0139-lxc-fix-get-cgroup-path-by-config-instead-of-cmd.patch