From 1e407c11a9d0f1d1029f19756ce6a12e9324e582 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sun, 1 Mar 2020 22:54:01 -0500 Subject: [PATCH] lxc: internal change Signed-off-by: LiFeng --- ...xc.isulad.init.args-config-interface.patch | 4 +- ...-add-support-share-namespace-by-path.patch | 4 +- ...lxc.isulad.populate.device-interface.patch | 4 +- 0004-support-isulad-fifo-log.patch | 4 +- 0005-auto-mount-cgroup-sys-and-proc.patch | 4 +- ...hen-set-no-ro-mount-mount-propagatio.patch | 4 +- 0007-use-isulad-log-format.patch | 4 +- ...lad-modify-exit-code-and-stop-signal.patch | 4 +- ...lxc_start-add-default-terminal-fifos.patch | 4 +- ...e-pid-ppid-info-into-file-for-isulad.patch | 4 +- ...FIFO-to-monitor-state-of-lxc-monitor.patch | 4 +- 0012-Init-fifos-in-lxc_attach_terminal.patch | 4 +- 0013-isulad-set-env-home-in-container.patch | 4 +- ...upport-rotate-for-container-log-file.patch | 4 +- 0015-fix-high-gcc-compile-bug.patch | 4 +- 0016-add-masked-paths-and-ro-paths.patch | 4 +- ...check-cgroup-cpu.shares-after-setted.patch | 4 +- ...xc-attach-add-support-terminal-fifos.patch | 4 +- ...eadonly-and-make-soft-link-of-subcgr.patch | 4 +- ...fix-log-error-when-symlink-subcgroup.patch | 4 +- 0021-lxc-attch-add-error-message.patch | 4 +- 0022-support-rootfs-mount-propagation.patch | 4 +- ...uid-and-gid-from-lxc-container-confi.patch | 4 +- ...ymlink-in-mount-entry-and-not-permit.patch | 4 +- 0025-support-oci-hooks.patch | 4 +- ...and-do-not-destroy-directory-when-de.patch | 4 +- 0027-fix-bug-of-memory-leak.patch | 4 +- 0028-support-rootfs-for-container.patch | 4 +- ...dd-start-timeout-to-limit-start-time.patch | 4 +- 0030-support-block-device-as-rootfs.patch | 4 +- 0031-clean-add-clean-resources-api.patch | 4 +- ...-caps-when-cap.keep-ISULAD_KEEP_NONE.patch | 4 +- ...upport-mount-squashfs-in-mount-entry.patch | 4 +- 0034-some-small-bugfix.patch | 4 +- 0035-lxc-fixup-builds-with-newer-glibc.patch | 4 +- ...aps-add-drop-caps-of-current-process.patch | 4 +- ...t-signal-handlers-and-set-umask-0027.patch | 4 +- ...ven-terminal-as-controlling-terminal.patch | 4 +- ...-message-when-container-start-failed.patch | 4 +- ...t-200ms-for-cmds-send-to-lxc-monitor.patch | 4 +- 0041-return-1-when-_lxc_start-fails.patch | 4 +- 0042-lxc-seccomp-adopt-to-lxc3.0.patch | 4 +- ...er-of-handler-to-fix-coredump-of-att.patch | 4 +- ...upport-space-in-volume-mount-and-env.patch | 4 +- ...fifos-Add-terminal-fifos-dynamically.patch | 4 +- 0046-Do-not-test-cgroup-writeable.patch | 4 +- ...mory-leak-in-lxc_global_config_value.patch | 4 +- ...r-ONLCR-flag-from-master-of-terminal.patch | 4 +- ...-Add-100ms-timeout-for-console-epoll.patch | 4 +- ...ules-for-specified-architecture-only.patch | 4 +- 0051-if-ocihook-is-empty.patch | 4 +- ...mp-fail-when-all-specified-in-config.patch | 4 +- ...estroy-empty-cgroup-path-return-ture.patch | 4 +- 0054-fix-invalid-log-message.patch | 4 +- 0055-Fix-compile-error.patch | 4 +- ...INUX_CAPABILITY_VERSION_3-to-set-cap.patch | 4 +- 0057-confile-add-support-umask.patch | 4 +- ...not-check-ppid-when-set-death-signal.patch | 4 +- 0059-delete-unused-variable-ppid.patch | 4 +- ...le-to-write-console-log-of-container.patch | 4 +- ...e-the-path-args-envs-execvp-dirctory.patch | 4 +- ...fore-set-read-only-path-and-masked-p.patch | 4 +- ...ignore-systemcall-load-failure-error.patch | 4 +- ...-Reduce-seccomp-processing-log-level.patch | 4 +- ...eturn-true-if-storage_init-init-fail.patch | 4 +- ...oes-not-report-an-error-after-execut.patch | 4 +- ...t-error-when-remove-directory-failed.patch | 4 +- ...tdout-stderr-log-of-container-consol.patch | 4 +- ...esses-if-container-shared-pid-namesp.patch | 4 +- ...rocess-for-shared-container-when-con.patch | 4 +- ...-path-according-to-cgroup-mountpoint.patch | 4 +- 0072-lxc-adapt-to-docker-18.09.patch | 4 +- 0073-lxc-support-set-additional-groups.patch | 4 +- 0074-lxc-only-add-valid-fd-to-mainloop.patch | 4 +- 0075-lxc-add-timeout-for-attach.patch | 4 +- 0076-lxc-delete-unused-variable.patch | 4 +- ...-files.limit-to-max-and-fix-bug-of-s.patch | 4 +- 0078-Run-pre-start-hook-before-chroot.patch | 4 +- ...inherid-env-from-parent-in-oci-hooks.patch | 4 +- 0080-lxc-fix-compile-error.patch | 4 +- ...c-Change-the-range-of-attach-timeout.patch | 4 +- ...-lxc-fix-memory-leak-cause-by-setenv.patch | 4 +- 0083-lxc-free-lxc-handler.patch | 4 +- 0084-lxc-memory-leak-of-lxc_grow_array.patch | 4 +- 0085-lxc-update-json-file-from-isulad.patch | 4 +- 0086-confile-add-support-systemd.patch | 4 +- 0087-lxc-adapt-to-spec-of-oci-hook.patch | 4 +- 0088-fix-lxc-build-error.patch | 4 +- ...dd-get-container-processes-pids-func.patch | 4 +- 0090-lxc-remove-unused-variable.patch | 4 +- ...spaced-kernel-params-can-be-changed-.patch | 4 +- ...put-error-when-create-unified-cgroup.patch | 4 +- 0093-optimize-isulad_kit-operator.patch | 4 +- 0094-exec-load-uid-gid-and-groups.patch | 4 +- ...e-unified-hierarchy-for-the-systemd-.patch | 4 +- 0096-close-inherited-fd-in-hook-process.patch | 4 +- ...error-when-fork-exec-error-for-hooks.patch | 4 +- ...d-mount-from-host-tmpfs-for-system-c.patch | 4 +- ...al-do-not-close-the-master-fd-of-pty.patch | 4 +- 0100-start-add-check-save-pid-info-file.patch | 4 +- 0101-lxc-fix-code-error.patch | 4 +- 0102-lxc-fix-compile-warnings.patch | 4 +- 0103-lxc-fix-code-error-in-conf.c.patch | 4 +- 0104-lxc-fix-code-error.patch | 4 +- 0105-lxc-fix-code-error-warnings.patch | 4 +- ...t-to-1s-for-cmds-send-to-lxc-monitor.patch | 4 +- 0107-add-log-for-failure-of-rename-file.patch | 4 +- 0108-check-calloc-input-valid.patch | 4 +- 0109-add-secure-compile-flags-to-lxc.patch | 4 +- 0110-add-doc-for-lxc.patch | 4 +- ...xc-use-safe_strdup-instead-of-strdup.patch | 4 +- 0112-fix-secure-errors.patch | 4 +- ...-Malloc-parameter-check-and-judgment.patch | 4 +- 0114-lxc-fix-code-errors.patch | 4 +- 0115-fix-compile-error-on-ubuntu.patch | 4 +- 0116-lxc-set-base-cgroup-path-to.patch | 4 +- ...ce-with-dir-mode-750-and-set-uid-gid.patch | 4 +- 0118-fix-sscanf-return-value-check.patch | 4 +- 0119-remove-unuse-binary.patch | 4 +- 0120-remove-unuse-unmount-namespace.patch | 4 +- ...timize-log-when-root-path-is-invalid.patch | 4 +- 0122-lxc-fix-code-reivew-errors.patch | 4 +- ...-in-accordance-with-hook-spec-in-oci.patch | 4 +- ...ose-maincmd-fd-before-destroy-cgroup.patch | 4 +- 0125-lxc-fix-strcat-bug-in-cleanpath.patch | 4 +- 0126-add-user-option-for-lxc-attach.patch | 4 +- ...y-write-size-begin-if-buffer-is-full.patch | 4 +- 0128-link-proc-mounts-to-etc-mtab.patch | 4 +- 0129-cgfsng-add-retry-for-enter-cgroup.patch | 4 +- ...intf-create-abstract-socket-name-bug.patch | 4 +- ...ommands-and-terminal-memory-leak-bug.patch | 4 +- 0132-lxc-fix-bug-in-cgroup-parent.patch | 4 +- 0133-lxc-fix-bug-in-cgfsng.patch | 4 +- 0134-lxc-do-cpuset-same-as-runc.patch | 4 +- 0135-lxc-fix-code-warnings-for-cgfsng.c.patch | 4 +- 0136-lxc-fix-retry-bug-in-cgroup.patch | 4 +- 0137-lxc-fix-bug-in-read-proc.patch | 4 +- ...lement-resize-function-in-exec-start.patch | 4 +- ...cgroup-path-by-config-instead-of-cmd.patch | 4 +- ...c-remove-umask-when-populate-devices.patch | 110 ++++++++++++++++++ lxc.spec | 7 +- 141 files changed, 394 insertions(+), 279 deletions(-) create mode 100644 0140-lxc-remove-umask-when-populate-devices.patch 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 f50959d..ffddf8b 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 fe3f5f02802c2447c7c7cc003b1f408c7360b1dc Mon Sep 17 00:00:00 2001 +From dd7c0b3cc5f4ce91f81dcb4f02bc8c4aaa023024 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 10 Jan 2019 06:54:37 -0500 -Subject: [PATCH 001/139] confile: add lxc.isulad.init.args config interface +Subject: [PATCH 001/140] 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 e1d9cf5..dab8b2f 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 0c195b1b6493fbb036e3eb9218f6a173e16a2123 Mon Sep 17 00:00:00 2001 +From bcc0965a02a571c39713056536d63f3378dcba3a Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 10 Jan 2019 08:42:19 -0500 -Subject: [PATCH 002/139] namespace: add support share namespace by path +Subject: [PATCH 002/140] 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 3f6b463..146239f 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 444ad05515c41c41313a97a08e91cc4d9e890d9f Mon Sep 17 00:00:00 2001 +From b4e5d9e162a17f50367aad1ea92df7dc09fa34e9 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 11 Jan 2019 01:51:25 -0500 -Subject: [PATCH 003/139] confile: add lxc.isulad.populate.device interface +Subject: [PATCH 003/140] 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 5e4a1d0..9dbb2cc 100644 --- a/0004-support-isulad-fifo-log.patch +++ b/0004-support-isulad-fifo-log.patch @@ -1,7 +1,7 @@ -From 28e96202dfe639add68c68fd31447031675fddbe Mon Sep 17 00:00:00 2001 +From f83ae83808419f6742265b8bafc3441fdca65cbb Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 11 Jan 2019 16:11:34 +0800 -Subject: [PATCH 004/139] support isulad fifo log +Subject: [PATCH 004/140] 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 76c6115..eee484b 100644 --- a/0005-auto-mount-cgroup-sys-and-proc.patch +++ b/0005-auto-mount-cgroup-sys-and-proc.patch @@ -1,7 +1,7 @@ -From 2f720e57a3982ca18e271ec96de68e10d6f6bc20 Mon Sep 17 00:00:00 2001 +From 7cb675179d84838d751312fb675c442325413270 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 10 Jan 2019 20:40:19 +0800 -Subject: [PATCH 005/139] auto mount cgroup sys and proc +Subject: [PATCH 005/140] 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 b46f5df..b64419d 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 fc244b0d105bf7519bba11cbc1c1e65ff2b9eaaa Mon Sep 17 00:00:00 2001 +From 80fcf03d746825fcf809f7b415782a410d9d87d3 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 11 Jan 2019 16:55:01 +0800 -Subject: [PATCH 006/139] conf.c: fix bug when set no ro mount, mount +Subject: [PATCH 006/140] 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 5d690be..a16ee90 100644 --- a/0007-use-isulad-log-format.patch +++ b/0007-use-isulad-log-format.patch @@ -1,7 +1,7 @@ -From 7195a22f6717a3f34d1c0fccedb4a015dba50eb8 Mon Sep 17 00:00:00 2001 +From 371dc5d5822cd629b86313c6b6cb39f02e7164e8 Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 11 Jan 2019 17:00:48 +0800 -Subject: [PATCH 007/139] use isulad log format +Subject: [PATCH 007/140] 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 882da8e..a565d18 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 02f351d441398861416e8101d491b4cdd6b4988b Mon Sep 17 00:00:00 2001 +From 98dbcb7dacbf18393295a9dcf054a65f9033ea5d Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 11 Jan 2019 17:44:53 +0800 -Subject: [PATCH 008/139] isulad: modify exit code and stop signal +Subject: [PATCH 008/140] 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 ec26e32..d52551c 100644 --- a/0009-lxc_start-add-default-terminal-fifos.patch +++ b/0009-lxc_start-add-default-terminal-fifos.patch @@ -1,7 +1,7 @@ -From d96fee01aeb6f95f5b017f5d8828e1994c549dc5 Mon Sep 17 00:00:00 2001 +From 3adac5cde53927f37a666fa8bda4ff06489ec694 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 11 Jan 2019 21:52:11 -0500 -Subject: [PATCH 009/139] lxc_start: add default terminal fifos +Subject: [PATCH 009/140] 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 76acabc..2e021ef 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 10aa38b436cde63126d70b943fd6533b95e89673 Mon Sep 17 00:00:00 2001 +From 523b705fb269a9463b9412aa3a814a9c71a743cc Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 11 Jan 2019 22:53:56 -0500 -Subject: [PATCH 010/139] Save pid/ppid info into file for isulad +Subject: [PATCH 010/140] 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 012d9c5..f2e4b7c 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 229ca2972fd7baf608873432cd4065d5f72a895d Mon Sep 17 00:00:00 2001 +From 70b6cb3c2a07f49af1f7dd251eac39e20c539f7e Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 12 Jan 2019 02:07:15 -0500 -Subject: [PATCH 011/139] Add exit FIFO to monitor state of [lxc monitor] +Subject: [PATCH 011/140] 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 18ee18f..1353b2f 100644 --- a/0012-Init-fifos-in-lxc_attach_terminal.patch +++ b/0012-Init-fifos-in-lxc_attach_terminal.patch @@ -1,7 +1,7 @@ -From 7c5602c6601ed2af22b20958b738c4723221e606 Mon Sep 17 00:00:00 2001 +From 0c5c03e94eb4beb4d55275bef52b14f1eef09d66 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 12 Jan 2019 03:23:53 -0500 -Subject: [PATCH 012/139] Init fifos in lxc_attach_terminal +Subject: [PATCH 012/140] 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 7b5ee4b..d99a515 100644 --- a/0013-isulad-set-env-home-in-container.patch +++ b/0013-isulad-set-env-home-in-container.patch @@ -1,7 +1,7 @@ -From a5846da29496fa7fbc540fd277f89860eec38d94 Mon Sep 17 00:00:00 2001 +From 3e630813a53666d5cdb8db81addcb86e9fe3c341 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 12 Jan 2019 14:42:27 +0800 -Subject: [PATCH 013/139] isulad: set env home in container +Subject: [PATCH 013/140] 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 fdcf5c5..55e075b 100644 --- a/0014-support-rotate-for-container-log-file.patch +++ b/0014-support-rotate-for-container-log-file.patch @@ -1,7 +1,7 @@ -From 90727142a0c6ac463f79e5eb55038e88ce919c23 Mon Sep 17 00:00:00 2001 +From 42efaa5362d755d9f9bf028c283ca24bc6a03cbb Mon Sep 17 00:00:00 2001 From: liuhao Date: Sat, 12 Jan 2019 15:29:56 +0800 -Subject: [PATCH 014/139] support rotate for container log file +Subject: [PATCH 014/140] 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 937ac36..5d79915 100644 --- a/0015-fix-high-gcc-compile-bug.patch +++ b/0015-fix-high-gcc-compile-bug.patch @@ -1,7 +1,7 @@ -From 8c95d80b70033abcedfecdb6220926a824266b69 Mon Sep 17 00:00:00 2001 +From 5b07aee14b1c49e11cdf42fb2b9c8887751cedb7 Mon Sep 17 00:00:00 2001 From: liuhao Date: Sat, 12 Jan 2019 16:28:41 +0800 -Subject: [PATCH 015/139] fix high gcc compile bug +Subject: [PATCH 015/140] 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 3f9f4de..7cf8cad 100644 --- a/0016-add-masked-paths-and-ro-paths.patch +++ b/0016-add-masked-paths-and-ro-paths.patch @@ -1,7 +1,7 @@ -From ac67190a1318bf9d7ed6c0e16834849137bcaabd Mon Sep 17 00:00:00 2001 +From 6abc6c02684ec9d48033969399352050789da2d6 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 12 Jan 2019 15:55:52 +0800 -Subject: [PATCH 016/139] add masked paths and ro paths +Subject: [PATCH 016/140] 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 3ec4f4a..51f9f67 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 14804433edf6c4d5732d109181f6ca1b0c19b0df Mon Sep 17 00:00:00 2001 +From 068331c965f3011f03e31b67d9791b2f81fd69b0 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 11:03:03 +0800 -Subject: [PATCH 017/139] isulad: check cgroup cpu.shares after setted +Subject: [PATCH 017/140] 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 f6215e3..8f2aace 100644 --- a/0018-lxc-attach-add-support-terminal-fifos.patch +++ b/0018-lxc-attach-add-support-terminal-fifos.patch @@ -1,7 +1,7 @@ -From 0f0b1f6315e95c958a56c5409b006efeabbf3d30 Mon Sep 17 00:00:00 2001 +From 0c11550c088cca12b6900623240799dc911da458 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 14 Jan 2019 02:18:26 -0500 -Subject: [PATCH 018/139] lxc-attach: add support terminal fifos +Subject: [PATCH 018/140] 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 8a5549b..f5de1fb 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 0e128190d1080af6a472619248a3f40e313759c6 Mon Sep 17 00:00:00 2001 +From 16616f224d5577594548b2ce1ee50f51a449e20d Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 13:51:01 +0800 -Subject: [PATCH 019/139] remount cgroup readonly and make soft link of +Subject: [PATCH 019/140] 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 690fe60..86350fe 100644 --- a/0020-fix-log-error-when-symlink-subcgroup.patch +++ b/0020-fix-log-error-when-symlink-subcgroup.patch @@ -1,7 +1,7 @@ -From ff9ed21b59f16aae369895612a9036f112daa035 Mon Sep 17 00:00:00 2001 +From a4a3b0c8f6a33676c62729ab7fc1e7d6f54536b8 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 15:33:12 +0800 -Subject: [PATCH 020/139] fix log error when symlink subcgroup +Subject: [PATCH 020/140] 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 aaab2f0..7c0b131 100644 --- a/0021-lxc-attch-add-error-message.patch +++ b/0021-lxc-attch-add-error-message.patch @@ -1,7 +1,7 @@ -From 6cdbeff1ad844ff52863a6e1488ed928f1c4fbb6 Mon Sep 17 00:00:00 2001 +From c26c254376f73d9b43dd1747746a2bc265a85bb3 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 14 Jan 2019 04:29:40 -0500 -Subject: [PATCH 021/139] lxc-attch: add error message +Subject: [PATCH 021/140] 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 287965a..bcee583 100644 --- a/0022-support-rootfs-mount-propagation.patch +++ b/0022-support-rootfs-mount-propagation.patch @@ -1,7 +1,7 @@ -From 20ff2957e4a3d49604c4fa29dac7b752746307a6 Mon Sep 17 00:00:00 2001 +From 26046eb2a18d2a7668dc213c86806efeca7d87a8 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 17:02:02 +0800 -Subject: [PATCH 022/139] support rootfs mount propagation +Subject: [PATCH 022/140] 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 c361f1d..b2163de 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 e07440f08f8e6f3e572a5159b004db8cb4a8db7b Mon Sep 17 00:00:00 2001 +From ecd40a856d039f7bc67ac076041a07cb369eaa77 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 17:09:57 +0800 -Subject: [PATCH 023/139] attach.c: change uid and gid from lxc container +Subject: [PATCH 023/140] 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 c320c4f..a46a07d 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 c008838abc34819705f1b2ad51b24b5d7bbd629c Mon Sep 17 00:00:00 2001 +From cf669a5cfd241dc8ec9ce2571e73fc13d4266bce Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 20:12:06 +0800 -Subject: [PATCH 024/139] isulad: support symlink in mount entry, and not +Subject: [PATCH 024/140] 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 4f29235..b2fe665 100644 --- a/0025-support-oci-hooks.patch +++ b/0025-support-oci-hooks.patch @@ -1,7 +1,7 @@ -From 84c36bf2aa1aaee87352b711df495fdc0bbf6f55 Mon Sep 17 00:00:00 2001 +From 38eef3f6000e2c4219007cf0f3638ef101fc67fb Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 14 Jan 2019 17:47:17 +0800 -Subject: [PATCH 025/139] support oci hooks +Subject: [PATCH 025/140] 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 f1a24e2..4f09d9c 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 ae243f820c25655931a1c1c79662ab9852fd4781 Mon Sep 17 00:00:00 2001 +From 238d4ac14b663aa5db904c55568c3710429d9bca Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 21:13:00 +0800 -Subject: [PATCH 026/139] remove filelock and do not destroy directory when +Subject: [PATCH 026/140] 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 ca5f854..a5875ce 100644 --- a/0027-fix-bug-of-memory-leak.patch +++ b/0027-fix-bug-of-memory-leak.patch @@ -1,7 +1,7 @@ -From e430c3656032d2f112b7ec7eb99e07f05c300e8b Mon Sep 17 00:00:00 2001 +From 9b7c539dec8af7c01abbcba4333b5f14e23c3b3b Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 14 Jan 2019 21:24:25 +0800 -Subject: [PATCH 027/139] fix bug of memory leak +Subject: [PATCH 027/140] 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 3d3db0d..df255ec 100644 --- a/0028-support-rootfs-for-container.patch +++ b/0028-support-rootfs-for-container.patch @@ -1,7 +1,7 @@ -From 4081310adbdf6b3baf13c5f8c40da2a01c7950e4 Mon Sep 17 00:00:00 2001 +From 0d83272984a667bcd530553ad4fb7ca0805ceb59 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 09:45:44 +0800 -Subject: [PATCH 028/139] support rootfs / for container +Subject: [PATCH 028/140] 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 82b5e42..fe5ad41 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 44e451ba9b7959a5e55dfe5213285da3c4e44290 Mon Sep 17 00:00:00 2001 +From be744bf5f224a4a14790c8f6a37c5335590daaf6 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 14 Jan 2019 21:38:07 -0500 -Subject: [PATCH 029/139] add start timeout to limit start time +Subject: [PATCH 029/140] 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 8520c12..1e548d0 100644 --- a/0030-support-block-device-as-rootfs.patch +++ b/0030-support-block-device-as-rootfs.patch @@ -1,7 +1,7 @@ -From d56b1478fb6cad6a7430ffb3444b86787201a565 Mon Sep 17 00:00:00 2001 +From c1b8d03c8911964c8323e4878ecfeca8162a7e08 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 16:00:30 +0800 -Subject: [PATCH 030/139] support block device as rootfs +Subject: [PATCH 030/140] 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 ef11eb1..b85707d 100644 --- a/0031-clean-add-clean-resources-api.patch +++ b/0031-clean-add-clean-resources-api.patch @@ -1,7 +1,7 @@ -From adfe5a04dabc871fb5cf3d4b505057ce8da02480 Mon Sep 17 00:00:00 2001 +From 97a9081b91b573df9c381331fde2dc6ec7f257e6 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 04:20:57 -0500 -Subject: [PATCH 031/139] clean: add clean resources api +Subject: [PATCH 031/140] 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 41350df..d6f35d3 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 eaa99ec61f64d47443bc427ccd5b266bc9bb1ab6 Mon Sep 17 00:00:00 2001 +From 9a8aa1961330227da81a6081db7254441afb3031 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 05:39:39 -0500 -Subject: [PATCH 032/139] Drop all caps when cap.keep=ISULAD_KEEP_NONE +Subject: [PATCH 032/140] 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 a872a5c..d0384e1 100644 --- a/0033-support-mount-squashfs-in-mount-entry.patch +++ b/0033-support-mount-squashfs-in-mount-entry.patch @@ -1,7 +1,7 @@ -From af999d8da16a36ff541d27d84d40bcf97f62e581 Mon Sep 17 00:00:00 2001 +From 572633fe6deaea6b8e4d423225aab452c6f0b7c0 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 19:54:13 +0800 -Subject: [PATCH 033/139] support mount squashfs in mount entry +Subject: [PATCH 033/140] 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 5056d7b..9db4036 100644 --- a/0034-some-small-bugfix.patch +++ b/0034-some-small-bugfix.patch @@ -1,7 +1,7 @@ -From 44dc712ff6f6ed02c4fb50829967b21497d5e3e1 Mon Sep 17 00:00:00 2001 +From 193bc24b1974e5149cf751ae9c50383b9c1a3999 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 15 Jan 2019 20:39:11 +0800 -Subject: [PATCH 034/139] some small bugfix +Subject: [PATCH 034/140] 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 7f2ffac..37be0c3 100644 --- a/0035-lxc-fixup-builds-with-newer-glibc.patch +++ b/0035-lxc-fixup-builds-with-newer-glibc.patch @@ -1,7 +1,7 @@ -From 8e3399baf65cdfc8383b5c387f6b05a8c8944435 Mon Sep 17 00:00:00 2001 +From cf85b9009e0085ec861d9294e6e04f1baa2ba28d Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 16 Jan 2019 20:53:25 +0800 -Subject: [PATCH 035/139] lxc: fixup builds with newer glibc +Subject: [PATCH 035/140] 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 a0c8303..64c8b90 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 2e7e54c3c6c76637ed095f349d1a5f28c60446c5 Mon Sep 17 00:00:00 2001 +From 35ef612b75dee5aa2bf313a8ceb24a7636319582 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 22:55:06 -0500 -Subject: [PATCH 036/139] drop_caps: add drop caps of current process +Subject: [PATCH 036/140] 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 69fe97a..e0e5a55 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 27f8123c3c4133c26bf1ef3ddec1be9e8bcd7119 Mon Sep 17 00:00:00 2001 +From 3ac4fd8b31c3c9e650cbe02383f4d65cfa078b20 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 23:14:14 -0500 -Subject: [PATCH 037/139] restore default signal handlers and set umask 0027 +Subject: [PATCH 037/140] 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 151c155..59278b7 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 00b977726fdcf2bbc5e44275db4c7b68ef8fa549 Mon Sep 17 00:00:00 2001 +From a1f81f063eb08dbf3ca99d298fef016b89d7d0d1 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 15 Jan 2019 23:24:21 -0500 -Subject: [PATCH 038/139] make the given terminal as controlling terminal +Subject: [PATCH 038/140] 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 f14728e..c631c14 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 e26b106534c01e94cb944da3dfcc75226ca03ee6 Mon Sep 17 00:00:00 2001 +From 24f908199916fc92cb7935bfccc19244d3a8d864 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 16 Jan 2019 14:38:38 +0800 -Subject: [PATCH 039/139] print error message when container start failed +Subject: [PATCH 039/140] 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 54e393a..81a925e 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 3697ed8dd6eb04d4664c8c56ee4e0e507db9c58d Mon Sep 17 00:00:00 2001 +From 04512fa5baae9aeff6ac8f120e718f339b56525f Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 16 Jan 2019 02:22:13 -0500 -Subject: [PATCH 040/139] add timeout(200ms) for cmds send to [lxc monitor] +Subject: [PATCH 040/140] 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 a54d25c..c62b4d3 100644 --- a/0041-return-1-when-_lxc_start-fails.patch +++ b/0041-return-1-when-_lxc_start-fails.patch @@ -1,7 +1,7 @@ -From b5b68b12ddaac8b39fcc4f621786e9ad6a271bd2 Mon Sep 17 00:00:00 2001 +From 4315f825763d752a9a9dfcb3ade70368634ee15d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 16 Jan 2019 05:53:36 -0500 -Subject: [PATCH 041/139] return -1 when _lxc_start fails +Subject: [PATCH 041/140] 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 b0e35e5..d1002b5 100644 --- a/0042-lxc-seccomp-adopt-to-lxc3.0.patch +++ b/0042-lxc-seccomp-adopt-to-lxc3.0.patch @@ -1,7 +1,7 @@ -From 666174f112d1f6f765f6755e6f1ed4d3f8ca9055 Mon Sep 17 00:00:00 2001 +From cd1cd3c8d36b5f689ceaac00965ab1a3e77c2f33 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 17 Jan 2019 03:09:00 +0800 -Subject: [PATCH 042/139] lxc: seccomp adopt to lxc3.0 +Subject: [PATCH 042/140] 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 8e7d9ad..897a797 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 d6893f5b376992b0b715a0b46c660c78144c1203 Mon Sep 17 00:00:00 2001 +From b94affbd314be09dcd5927b15bee85459f6bc2ff Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 17 Jan 2019 10:19:37 +0800 -Subject: [PATCH 043/139] check null pointer of handler to fix coredump of +Subject: [PATCH 043/140] 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 a706896..4fb9100 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 37e6f7c4ffb31290322791d972f4ab8e0fa34dcc Mon Sep 17 00:00:00 2001 +From 24d0250197bab7b59c3437cce7845af1fc88df7e Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 17 Jan 2019 10:18:23 +0800 -Subject: [PATCH 044/139] support space in --volume, --mount and --env +Subject: [PATCH 044/140] 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 625c87e..af7465e 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 00789ddaf32704bbb848c63eb69c2b299c2d3471 Mon Sep 17 00:00:00 2001 +From 934f4937ec177e9c95445b800ca11adbb7c3a0ef Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 17 Jan 2019 02:18:14 -0500 -Subject: [PATCH 045/139] add_terminal_fifos: Add terminal fifos dynamically +Subject: [PATCH 045/140] 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 894bd7f..9e9bc65 100644 --- a/0046-Do-not-test-cgroup-writeable.patch +++ b/0046-Do-not-test-cgroup-writeable.patch @@ -1,7 +1,7 @@ -From ef7488f89bbdc933e2a84744092150939bef7c4c Mon Sep 17 00:00:00 2001 +From fc6da7b9465295da1dc1d40d835a8c7680207d66 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 17 Jan 2019 03:49:16 -0500 -Subject: [PATCH 046/139] Do not test cgroup writeable +Subject: [PATCH 046/140] 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 229260e..4dc1792 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 7bb780cc04729b9a9231a9403b8ac5465c0ca44b Mon Sep 17 00:00:00 2001 +From f238c892c331361985a2d8f0211b4fd78ce99682 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 17 Jan 2019 07:43:23 -0500 -Subject: [PATCH 047/139] Fix memory leak in lxc_global_config_value +Subject: [PATCH 047/140] 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 bb05f83..8ce255b 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 2b9f7cb1c39c18bd79f208f178d740fb1103f5e8 Mon Sep 17 00:00:00 2001 +From fc95cef9efded165758645b8f04da7c0ffd6b762 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 17 Jan 2019 20:46:33 +0800 -Subject: [PATCH 048/139] clear ONLCR flag from master of terminal +Subject: [PATCH 048/140] 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 3ca06c0..813462e 100644 --- a/0049-Add-100ms-timeout-for-console-epoll.patch +++ b/0049-Add-100ms-timeout-for-console-epoll.patch @@ -1,7 +1,7 @@ -From da947d1642aaade0f814dcea53f8f577f28187b1 Mon Sep 17 00:00:00 2001 +From c144ed16a5a45c8dc2873bbb1016d8bc1fc02a9c Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 19 Jan 2019 02:05:17 -0500 -Subject: [PATCH 049/139] Add 100ms timeout for console epoll +Subject: [PATCH 049/140] 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 3e22497..1291f69 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 db80cc666f47124c166771fbd018855f62ea0de3 Mon Sep 17 00:00:00 2001 +From 15d3b1e6c5e5ac896b15d04d486ba0c04ca39336 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 18 Jan 2019 02:11:11 -0500 -Subject: [PATCH 050/139] seccomp: add rules for specified architecture only +Subject: [PATCH 050/140] 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 e1a3554..71079f9 100644 --- a/0051-if-ocihook-is-empty.patch +++ b/0051-if-ocihook-is-empty.patch @@ -1,7 +1,7 @@ -From 4355ae3c26f9cc26d9c95672945ca2630466b3d0 Mon Sep 17 00:00:00 2001 +From 629036e2732ed24c776b422271cef51cf8458f18 Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 22 Jan 2019 11:25:45 +0800 -Subject: [PATCH 051/139] if ocihook is empty +Subject: [PATCH 051/140] 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 d042675..4df5788 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 d945679e11c19594e13ec8c2fbbaeb65d2f59f60 Mon Sep 17 00:00:00 2001 +From 2fbc0027a81a8ec79008afeb5298f5ec99203ea4 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 21 Jan 2019 23:28:43 -0500 -Subject: [PATCH 052/139] Fix seccomp fail when [all] specified in config +Subject: [PATCH 052/140] 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 365f7e7..4ed4b5d 100644 --- a/0053-destroy-empty-cgroup-path-return-ture.patch +++ b/0053-destroy-empty-cgroup-path-return-ture.patch @@ -1,7 +1,7 @@ -From 930e729ff7705532bf0248ec0c35017dbd8fbd9c Mon Sep 17 00:00:00 2001 +From 55aa538a996fb98bd76ca41029c93147d22c1ecf Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 22 Jan 2019 14:45:54 +0800 -Subject: [PATCH 053/139] destroy empty cgroup path return ture +Subject: [PATCH 053/140] 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 a7330bf..86aa641 100644 --- a/0054-fix-invalid-log-message.patch +++ b/0054-fix-invalid-log-message.patch @@ -1,7 +1,7 @@ -From f6a4f1363e2e380cad2fe973cd0b0b3a6e4a37ea Mon Sep 17 00:00:00 2001 +From 6ca37fb9e3838f3ddffec7e0325e37e6925f3562 Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 22 Jan 2019 20:14:53 +0800 -Subject: [PATCH 054/139] fix invalid log message +Subject: [PATCH 054/140] fix invalid log message fix invalid log message diff --git a/0055-Fix-compile-error.patch b/0055-Fix-compile-error.patch index 468dabb..45188cd 100644 --- a/0055-Fix-compile-error.patch +++ b/0055-Fix-compile-error.patch @@ -1,7 +1,7 @@ -From 7e6b4062ab3ea0b7ef35d5b19d81b39eb29ea8d5 Mon Sep 17 00:00:00 2001 +From e1e5091673c7464a320cdfc08d91ad176a636f71 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 24 Jan 2019 05:14:24 -0500 -Subject: [PATCH 055/139] Fix compile error +Subject: [PATCH 055/140] 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 b52074c..9539bd1 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 a847fcefdce50fa6b6fe307ff4f80d9f7927eb35 Mon Sep 17 00:00:00 2001 +From 94ae346e2bff8bb29eae17604b75b1de19258277 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 26 Jan 2019 02:22:48 -0500 -Subject: [PATCH 056/139] [caps]: use _LINUX_CAPABILITY_VERSION_3 to set cap +Subject: [PATCH 056/140] [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 78db0ad..58e513c 100644 --- a/0057-confile-add-support-umask.patch +++ b/0057-confile-add-support-umask.patch @@ -1,7 +1,7 @@ -From 2946339a18ea794a8a4637353ea5c30045131bba Mon Sep 17 00:00:00 2001 +From 5712305711a0f57d2d167b49da1093204abaffcd Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 30 Jan 2019 03:39:42 -0500 -Subject: [PATCH 057/139] confile: add support umask +Subject: [PATCH 057/140] 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 36f6521..a28818e 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 9fa6889015604b101ce921c70d8dadb2c70358d0 Mon Sep 17 00:00:00 2001 +From 2c5d318fb3a809c017e0b57c80de500bceb9b495 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 12 Feb 2019 14:00:47 +0800 -Subject: [PATCH 058/139] do not check ppid when set death signal +Subject: [PATCH 058/140] 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 bff6ca7..abce727 100644 --- a/0059-delete-unused-variable-ppid.patch +++ b/0059-delete-unused-variable-ppid.patch @@ -1,7 +1,7 @@ -From d8e4fcd5e937cd4800f44e20afb6161be5671f9a Mon Sep 17 00:00:00 2001 +From 72e156f81d0db66d42724172a9d4b6fefbd6fabc Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 12 Feb 2019 14:36:35 +0800 -Subject: [PATCH 059/139] delete unused variable ppid +Subject: [PATCH 059/140] 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 2e6bee7..3d0e757 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 28d6bb955b254a0dd29bf47dc359359ba3da579f Mon Sep 17 00:00:00 2001 +From d402202eb37433f26c1e9f4ab11ce8e530ad19e7 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 30 Jan 2019 17:44:19 +0800 -Subject: [PATCH 060/139] using json-file to write console log of container +Subject: [PATCH 060/140] 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 e2a91a7..5ba9126 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 15ecacd152d85b4f7818e7612178081a23e53826 Mon Sep 17 00:00:00 2001 +From fee671d0cd2813016f7d84fad2907ba28c24993d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 21 Feb 2019 05:37:05 -0500 -Subject: [PATCH 061/139] Fix hook: use the path, args, envs execvp dirctory +Subject: [PATCH 061/140] 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 6edd5b3..d3e62d6 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 bf15038f2d74cf77c2475bd1068cdeaa4bf6b94d Mon Sep 17 00:00:00 2001 +From 6fc3c7a016b64583c9f84f90c5303376b4f8f613 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 26 Feb 2019 17:21:18 +0800 -Subject: [PATCH 062/139] setup sysctls before set read-only path and masked +Subject: [PATCH 062/140] 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 74a1719..368a690 100644 --- a/0063-lxc-ignore-systemcall-load-failure-error.patch +++ b/0063-lxc-ignore-systemcall-load-failure-error.patch @@ -1,7 +1,7 @@ -From d7adb15dabbc3468675be2b966806574222495e5 Mon Sep 17 00:00:00 2001 +From 5fb35ffb15082021cfaae7b17d31175a63701514 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 9 Mar 2019 03:10:06 +0800 -Subject: [PATCH 063/139] lxc: ignore systemcall load failure error +Subject: [PATCH 063/140] 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 7bbd8e5..7bd66f0 100644 --- a/0064-lxc-Reduce-seccomp-processing-log-level.patch +++ b/0064-lxc-Reduce-seccomp-processing-log-level.patch @@ -1,7 +1,7 @@ -From 41491565e90465d2d0e64c268ba3d8d3279c6556 Mon Sep 17 00:00:00 2001 +From 5c4a3db298a0a7857f6bb34a285c40e6f2a4b99b Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sun, 10 Mar 2019 00:47:05 +0800 -Subject: [PATCH 064/139] lxc: Reduce seccomp processing log level +Subject: [PATCH 064/140] 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 6a9259c..9a6fbfe 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 b4774d615555f3864720d7dd33b87e6d4ffccd36 Mon Sep 17 00:00:00 2001 +From c3f85efe70c8dabe1c7393a5fd83f4465ec46812 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 11 Mar 2019 23:26:27 -0400 -Subject: [PATCH 065/139] Storage: return true if storage_init init fail +Subject: [PATCH 065/140] 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 e5ec9aa..7958457 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 374e9e275bd379cfb70df2b252383a50869c42f6 Mon Sep 17 00:00:00 2001 +From 54a21ab4594e606168d690ef09bbbd13329de843 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 15 Mar 2019 10:11:10 +0800 -Subject: [PATCH 066/139] lxc: Pids limit does not report an error after +Subject: [PATCH 066/140] 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 535ae53..07078d4 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 c3b0074f845e009695ae55f8ef01b9e7ba450350 Mon Sep 17 00:00:00 2001 +From 8f356ca0106a31ac7a14a17d06fb325aa16519ee Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 16 Mar 2019 10:06:13 +0800 -Subject: [PATCH 067/139] lxc: report error when remove directory failed +Subject: [PATCH 067/140] 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 534ae1e..50ec371 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 25e6f0bfa28a7da88a54da99123e2bbd60da2cb2 Mon Sep 17 00:00:00 2001 +From 8168df14e2a9c51a2d1637485d45e957d0a23438 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Feb 2019 20:27:47 +0800 -Subject: [PATCH 068/139] support record stdout, stderr log of container +Subject: [PATCH 068/140] 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 64a2f38..2f7da6a 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 87e3f205f62dc0f49be1857c6a0a72a57bdc201a Mon Sep 17 00:00:00 2001 +From 7a5088c289e2c9a543ba08137bffe873206962ba Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Mar 2019 15:48:02 +0800 -Subject: [PATCH 069/139] lxc: killall processes if container shared pid +Subject: [PATCH 069/140] 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 461f6e1..89aa437 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 b7771f88ab84ae04960a3d8f40bfea7093ff4cb7 Mon Sep 17 00:00:00 2001 +From 38b34aa2e20484616c40dba507f1c7a36afb56c2 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Mar 2019 17:21:44 +0800 -Subject: [PATCH 070/139] lxc: signal all process for shared container when +Subject: [PATCH 070/140] 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 e5a9e78..8a0171b 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 0ec5d80c41491e4f2fa2e117fc6db4c205e1e415 Mon Sep 17 00:00:00 2001 +From 6b5baec9fce40d498c3a9d3e8fbe08ff1e3751fd Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 21 Mar 2019 22:05:09 +0800 -Subject: [PATCH 071/139] lxc: get cgroup path according to cgroup mountpoint +Subject: [PATCH 071/140] 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 860d0cc..19c6284 100644 --- a/0072-lxc-adapt-to-docker-18.09.patch +++ b/0072-lxc-adapt-to-docker-18.09.patch @@ -1,7 +1,7 @@ -From d69ef31d49418d02a644c802c47f9e933fb186c3 Mon Sep 17 00:00:00 2001 +From 15e78bbe59a574b5c41405cfdb84a496095a1662 Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 25 Mar 2019 18:03:23 +0800 -Subject: [PATCH 072/139] lxc: adapt to docker-18.09 +Subject: [PATCH 072/140] 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 7c83b93..9a8ef32 100644 --- a/0073-lxc-support-set-additional-groups.patch +++ b/0073-lxc-support-set-additional-groups.patch @@ -1,7 +1,7 @@ -From 9d41aabd89b3e9de7cfedf4330bfb5984bd43dbc Mon Sep 17 00:00:00 2001 +From d766c43da139d6e893e7d450943425e524be639a Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 25 Mar 2019 17:17:00 +0800 -Subject: [PATCH 073/139] lxc: support set additional groups +Subject: [PATCH 073/140] 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 61d90bf..dc0df12 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 0f17217d431458de75d33c4a80ce28eac1bbb2c5 Mon Sep 17 00:00:00 2001 +From 0a90b2cbb4e0a2e7dd3f533e4a20d9e522889ea5 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 26 Mar 2019 16:11:13 +0800 -Subject: [PATCH 074/139] lxc: only add valid fd to mainloop +Subject: [PATCH 074/140] 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 4f41d6f..14faaac 100644 --- a/0075-lxc-add-timeout-for-attach.patch +++ b/0075-lxc-add-timeout-for-attach.patch @@ -1,7 +1,7 @@ -From 6affa9bf74fcc2ebb1dd785b73a47552669af82e Mon Sep 17 00:00:00 2001 +From 2ce6149708aaa421373497cffa412d9815c7f7f7 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 3 Apr 2019 19:54:36 +0800 -Subject: [PATCH 075/139] lxc: add timeout for attach +Subject: [PATCH 075/140] 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 523d3f7..5f33534 100644 --- a/0076-lxc-delete-unused-variable.patch +++ b/0076-lxc-delete-unused-variable.patch @@ -1,7 +1,7 @@ -From 49aea1a5c02f041fc5622ed0a998c2f5b5b45d5b Mon Sep 17 00:00:00 2001 +From b2904bbeda12d9d1e6864717f76052c05b213ab2 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Thu, 4 Apr 2019 11:19:48 +0800 -Subject: [PATCH 076/139] lxc: delete unused variable +Subject: [PATCH 076/140] 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 d60ce0f..7684c79 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 bead04c30d859abd3f0ad7635266f0f29721640a Mon Sep 17 00:00:00 2001 +From 940815cbc68a12ada2b0d9b212ded98a59590de6 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Tue, 2 Apr 2019 23:59:20 -0400 -Subject: [PATCH 077/139] lxc: set negative files.limit to max and fix bug of +Subject: [PATCH 077/140] 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 3072948..138a07d 100644 --- a/0078-Run-pre-start-hook-before-chroot.patch +++ b/0078-Run-pre-start-hook-before-chroot.patch @@ -1,7 +1,7 @@ -From 613aa707fc904d35dbcbe9c6ecf42e0851aa4492 Mon Sep 17 00:00:00 2001 +From 8820d8dcd7684f123a99304df532139315a1276f Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 3 Apr 2019 23:36:04 -0400 -Subject: [PATCH 078/139] Run pre-start hook before chroot +Subject: [PATCH 078/140] 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 13630e0..ddb9332 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 d7ebde92b6ceb66aef1280e7a81191bf5ef69ac9 Mon Sep 17 00:00:00 2001 +From e87fd4a3b69a4c98d2c50ede559d56b43f65578a Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 4 Apr 2019 17:21:56 +0800 -Subject: [PATCH 079/139] inherid env from parent in oci hooks +Subject: [PATCH 079/140] 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 f62cfa7..44ac724 100644 --- a/0080-lxc-fix-compile-error.patch +++ b/0080-lxc-fix-compile-error.patch @@ -1,7 +1,7 @@ -From 12b020ddc343d35e4db1c23de7c511deb3b9f4a3 Mon Sep 17 00:00:00 2001 +From 1e70c61ab75a71c99926e5f7c9e852dc81102bb9 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 8 Apr 2019 08:29:46 -0400 -Subject: [PATCH 080/139] lxc: fix compile error +Subject: [PATCH 080/140] 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 e4253a5..8e06619 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 08f5898a07450f2fb547409843fb9cf67f74ade9 Mon Sep 17 00:00:00 2001 +From 5cfdce31c3afcf8d688151e71e84d056f2229a27 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 8 Apr 2019 16:42:43 +0800 -Subject: [PATCH 081/139] lxc: Change the range of attach timeout +Subject: [PATCH 081/140] 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 cd11f04..286737d 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 9acd5efe54f66552a3389938c0ec86356ac8f039 Mon Sep 17 00:00:00 2001 +From ccec379d6577df3a01f11f054f37ce7e5b95088c Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Apr 2019 15:27:31 +0800 -Subject: [PATCH 082/139] lxc: fix memory leak cause by setenv +Subject: [PATCH 082/140] 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 6e3cd2b..8b35c5b 100644 --- a/0083-lxc-free-lxc-handler.patch +++ b/0083-lxc-free-lxc-handler.patch @@ -1,7 +1,7 @@ -From 72d6a0b51dbcf6ef3c8eaa1ba5c3495ee1460083 Mon Sep 17 00:00:00 2001 +From ec26a6a90167cc2a4624a4a5fc68bb9bcb56c651 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Apr 2019 20:34:51 +0800 -Subject: [PATCH 083/139] lxc: free lxc-handler +Subject: [PATCH 083/140] 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 d150f76..42566f7 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 2d6f584233d57b6a97ed9246969be387017c8323 Mon Sep 17 00:00:00 2001 +From 4e84395bebe59ac94bf9d7ee11a985c776a05fbe Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Apr 2019 22:36:42 +0800 -Subject: [PATCH 084/139] lxc: memory leak of lxc_grow_array +Subject: [PATCH 084/140] 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 e17cf09..46221d1 100644 --- a/0085-lxc-update-json-file-from-isulad.patch +++ b/0085-lxc-update-json-file-from-isulad.patch @@ -1,7 +1,7 @@ -From 6e5b1a93fb3fd25d23ad4cf8cc99251a863cccd3 Mon Sep 17 00:00:00 2001 +From 1c36fa9e699c1bf892e89ba71b0052b34b55a89d Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Fri, 12 Apr 2019 06:06:12 -0400 -Subject: [PATCH 085/139] lxc: update json file from isulad +Subject: [PATCH 085/140] 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 2bf1f0c..a802850 100644 --- a/0086-confile-add-support-systemd.patch +++ b/0086-confile-add-support-systemd.patch @@ -1,7 +1,7 @@ -From 685248157e305ad6abe798cb40409ad55eb63c16 Mon Sep 17 00:00:00 2001 +From 2b8bafa86e5086ee9f85dba13a73fb3abdf8656f Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Sat, 20 Apr 2019 22:40:18 +0800 -Subject: [PATCH 086/139] confile: add support systemd +Subject: [PATCH 086/140] 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 52bad2b..f226287 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 a3f93824beaa0cb2634a4d6db268c1b90d5a7524 Mon Sep 17 00:00:00 2001 +From 363ac4aedbf09ade3de55bca20692cf157860f92 Mon Sep 17 00:00:00 2001 From: liuhao Date: Wed, 24 Apr 2019 22:22:55 +0800 -Subject: [PATCH 087/139] lxc: adapt to spec of oci hook +Subject: [PATCH 087/140] 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 0626006..f94b11b 100644 --- a/0088-fix-lxc-build-error.patch +++ b/0088-fix-lxc-build-error.patch @@ -1,7 +1,7 @@ -From d1adce7546410b4fa916c99a1807b653e6a950dd Mon Sep 17 00:00:00 2001 +From c0efbe3c3aafaad6842d8a28cd06635bbb5a566c Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 25 Apr 2019 10:12:16 +0800 -Subject: [PATCH 088/139] fix lxc build error +Subject: [PATCH 088/140] 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 c3d9c24..964f7ae 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 cf0675d14282a391ea088310d75354a2196125ac Mon Sep 17 00:00:00 2001 +From e67bd0cb9f6228f5ff95e71ae3cb1332cb1ff851 Mon Sep 17 00:00:00 2001 From: maoweiyong Date: Tue, 23 Apr 2019 12:12:55 +0800 -Subject: [PATCH 089/139] lxc:add get container processes pids func +Subject: [PATCH 089/140] 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 8c3bbb4..9ffdd59 100644 --- a/0090-lxc-remove-unused-variable.patch +++ b/0090-lxc-remove-unused-variable.patch @@ -1,7 +1,7 @@ -From c488db18d557594331fd8d2774d9e05eaeb57726 Mon Sep 17 00:00:00 2001 +From 9d7bdd43ca5710e625f02b2dcc7b178071f4ae2b Mon Sep 17 00:00:00 2001 From: maoweiyong Date: Thu, 25 Apr 2019 21:21:12 +0800 -Subject: [PATCH 090/139] lxc: remove unused variable +Subject: [PATCH 090/140] 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 e960470..02e1e7f 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 474dcbe83981a95fe3be1f1da0d4289730a29a1c Mon Sep 17 00:00:00 2001 +From 140cadc75c14917c9d0aa3c6c65d84fd8b682adb Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 26 Apr 2019 07:13:53 +0800 -Subject: [PATCH 091/139] lxc: support namespaced kernel params can be changed +Subject: [PATCH 091/140] 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 a3157aa..ea2a75a 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 ea3990558d3583344654675edce9458ec257fd38 Mon Sep 17 00:00:00 2001 +From 3e1d32785539e016dbca1e69fdb3a8bf93299238 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 29 Apr 2019 04:13:52 -0400 -Subject: [PATCH 092/139] lxc: add output error when create unified cgroup +Subject: [PATCH 092/140] 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 6be9b33..10d5720 100644 --- a/0093-optimize-isulad_kit-operator.patch +++ b/0093-optimize-isulad_kit-operator.patch @@ -1,7 +1,7 @@ -From d766442be1dca15cff162671f367fa867ba74c94 Mon Sep 17 00:00:00 2001 +From eeaf0b1638d87626655577c5b1c1e32e3b3d10a0 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 2 May 2019 11:23:50 +0800 -Subject: [PATCH 093/139] optimize isulad_kit operator +Subject: [PATCH 093/140] 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 6b1ca81..89d3b82 100644 --- a/0094-exec-load-uid-gid-and-groups.patch +++ b/0094-exec-load-uid-gid-and-groups.patch @@ -1,7 +1,7 @@ -From db68b7129fb8813b99364b58ffef086a2df3c426 Mon Sep 17 00:00:00 2001 +From 64febbef5f589ae93aebb1845a78e4379d5c584b Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 7 May 2019 12:55:03 +0800 -Subject: [PATCH 094/139] exec load uid gid and groups +Subject: [PATCH 094/140] 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 e03f51b..b5a550e 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 16038190f1cbbdc58e5b114c049d54bfce72a198 Mon Sep 17 00:00:00 2001 +From 724ce7ab5bf6dd83ee034d13b2d60515632e1d67 Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 10 May 2019 11:05:42 +0800 -Subject: [PATCH 095/139] lxc: don't use the unified hierarchy for the systemd +Subject: [PATCH 095/140] 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 3be69a9..847beed 100644 --- a/0096-close-inherited-fd-in-hook-process.patch +++ b/0096-close-inherited-fd-in-hook-process.patch @@ -1,7 +1,7 @@ -From 0dc5178ad05c6c2106be4f15e8d91211e6246eb5 Mon Sep 17 00:00:00 2001 +From 69556473f1e248be4ec79ccf069c65238ee9b8c1 Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 13 May 2019 16:45:50 +0800 -Subject: [PATCH 096/139] close inherited fd in hook process +Subject: [PATCH 096/140] 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 52c8a42..360670a 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 8f74f51e2ea6fb316d99af96f091e35b105402ca Mon Sep 17 00:00:00 2001 +From 5afd4ebc85644ab8e1443ad80ba9bd311fe5f056 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 15 May 2019 00:53:49 -0400 -Subject: [PATCH 097/139] lxc: report error when fork/exec error for hooks +Subject: [PATCH 097/140] 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 e505e88..20d0de6 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 fc25d8c2e9e95f227f13244503b91aaf24367c90 Mon Sep 17 00:00:00 2001 +From 5fd25f9a207a2c401e9bae990a96ec9b9056a2df Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Wed, 15 May 2019 12:42:08 +0800 -Subject: [PATCH 098/139] lxc: make /dev bind mount from host tmpfs for system +Subject: [PATCH 098/140] 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 3f168b3..a2e05f3 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 0c622aaccfa9ea9bb79fcc6fb1e6643ccc25858b Mon Sep 17 00:00:00 2001 +From 3d4a2fd9e5db67d6771ebd3268b05d7e461d3c74 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 21 May 2019 04:53:16 -0400 -Subject: [PATCH 099/139] terminal: do not close the master fd of pty +Subject: [PATCH 099/140] 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 ddb38d8..9aa93bc 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 c6bd787c3cbb63b7a0085e20bd22a530572a2a08 Mon Sep 17 00:00:00 2001 +From 33221d0ca431710cc1f83502d4223f1848c88ae9 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 22 May 2019 23:00:17 -0400 -Subject: [PATCH 100/139] start: add check save pid info file +Subject: [PATCH 100/140] 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 84bf1bc..100a42b 100644 --- a/0101-lxc-fix-code-error.patch +++ b/0101-lxc-fix-code-error.patch @@ -1,7 +1,7 @@ -From 788e7b9b251cd81ebb717fc21c50427b671df7ef Mon Sep 17 00:00:00 2001 +From f0f4a3317205ff6d0d9dcad3445b9e2947a082e1 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 05:14:46 -0400 -Subject: [PATCH 101/139] lxc: fix code error +Subject: [PATCH 101/140] 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 1308c28..88e0d74 100644 --- a/0102-lxc-fix-compile-warnings.patch +++ b/0102-lxc-fix-compile-warnings.patch @@ -1,7 +1,7 @@ -From ae1e9bad8f14613c01ce940795472961cc2e9561 Mon Sep 17 00:00:00 2001 +From 1615cf43284c6e91c2b0ea0826ce7dba7ab216f0 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 06:19:07 -0400 -Subject: [PATCH 102/139] lxc: fix compile warnings +Subject: [PATCH 102/140] 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 1c61d4e..82f64d3 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 3e63b358fcdbfc5d15771aff3e5268fb001c55e1 Mon Sep 17 00:00:00 2001 +From ae19c33cf486d719210ebe624ab8873369bb3170 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 11:14:22 -0400 -Subject: [PATCH 103/139] lxc: fix code error in conf.c +Subject: [PATCH 103/140] 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 7ddd485..b460072 100644 --- a/0104-lxc-fix-code-error.patch +++ b/0104-lxc-fix-code-error.patch @@ -1,7 +1,7 @@ -From bd464060c85e092316ba18f93ec647f783e41116 Mon Sep 17 00:00:00 2001 +From 1f2f95d5cc90ecd7d3d8c8a6aab5381cda0483b5 Mon Sep 17 00:00:00 2001 From: tanyifeng Date: Mon, 3 Jun 2019 11:27:34 -0400 -Subject: [PATCH 104/139] lxc: fix code error +Subject: [PATCH 104/140] 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 02bf4e6..542aa71 100644 --- a/0105-lxc-fix-code-error-warnings.patch +++ b/0105-lxc-fix-code-error-warnings.patch @@ -1,7 +1,7 @@ -From 0a3af523280a1a0a39c0c368b5c562b3b6e30a6e Mon Sep 17 00:00:00 2001 +From 3e73fc4707851601f3538502e8364a1550da2741 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 3 Jun 2019 23:02:50 -0400 -Subject: [PATCH 105/139] lxc: fix code error warnings +Subject: [PATCH 105/140] 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 3f449c6..8768382 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 973379a46fe3b322769f6d991d3219a54ec7b476 Mon Sep 17 00:00:00 2001 +From 307920aff38a933a7df5245917933a35f9cf7a15 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 6 Jun 2019 22:48:38 -0400 -Subject: [PATCH 106/139] set timeout to 1s for cmds send to [lxc monitor] +Subject: [PATCH 106/140] 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 9f77662..de0c29f 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 c45ff276f829272bc6153723263fad64234c5b1d Mon Sep 17 00:00:00 2001 +From 819a1a3a4badd6f794cc161199eb2446a2325cdf Mon Sep 17 00:00:00 2001 From: liuhao Date: Mon, 17 Jun 2019 20:17:37 +0800 -Subject: [PATCH 107/139] add log for failure of rename file +Subject: [PATCH 107/140] 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 ffe3041..27a62f3 100644 --- a/0108-check-calloc-input-valid.patch +++ b/0108-check-calloc-input-valid.patch @@ -1,7 +1,7 @@ -From 2fd043e31d7631c89329ece107313785af140a77 Mon Sep 17 00:00:00 2001 +From 68336a66df175c8f59e49ded276f95073326bfcd Mon Sep 17 00:00:00 2001 From: liuhao Date: Tue, 18 Jun 2019 23:16:09 +0800 -Subject: [PATCH 108/139] check calloc input valid +Subject: [PATCH 108/140] 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 38b1026..9982169 100644 --- a/0109-add-secure-compile-flags-to-lxc.patch +++ b/0109-add-secure-compile-flags-to-lxc.patch @@ -1,7 +1,7 @@ -From 8462e7031703987a774e9935bda1af618f1db887 Mon Sep 17 00:00:00 2001 +From d723e8b3a179e8f469242c9dc9eaab9383d2ee3b Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 20 Jun 2019 17:46:40 +0800 -Subject: [PATCH 109/139] add secure compile flags to lxc +Subject: [PATCH 109/140] 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 8ed1964..c1ca60b 100644 --- a/0110-add-doc-for-lxc.patch +++ b/0110-add-doc-for-lxc.patch @@ -1,7 +1,7 @@ -From eb92171582283b603420b8558de8a7c59e5296d9 Mon Sep 17 00:00:00 2001 +From 3e92134299a675e474074415b68be3755be24c9b Mon Sep 17 00:00:00 2001 From: liuhao Date: Fri, 21 Jun 2019 17:20:43 +0800 -Subject: [PATCH 110/139] add doc for lxc +Subject: [PATCH 110/140] 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 13caba4..257e8b9 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 a5f5a84fc4cab4b266c8b496ebb740010265b14b Mon Sep 17 00:00:00 2001 +From b1ff42de6d5a507d66e9fe091a18d003f3022fbb Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 3 Jul 2019 23:41:15 -0400 -Subject: [PATCH 111/139] lxc: use safe_strdup instead of strdup +Subject: [PATCH 111/140] 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 8ab77a4..617cd16 100644 --- a/0112-fix-secure-errors.patch +++ b/0112-fix-secure-errors.patch @@ -1,7 +1,7 @@ -From b20f7a706f5ad40221f765b026902435b61f87a1 Mon Sep 17 00:00:00 2001 +From 57d1ff71ce9c6d456e2fcaa8ca1229419d184ea9 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 4 Jul 2019 11:08:26 +0800 -Subject: [PATCH 112/139] fix secure errors +Subject: [PATCH 112/140] 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 636238c..12fbfa3 100644 --- a/0113-Malloc-parameter-check-and-judgment.patch +++ b/0113-Malloc-parameter-check-and-judgment.patch @@ -1,7 +1,7 @@ -From 5d86635af7e2c38a83c2611b61836ce285b8d8a3 Mon Sep 17 00:00:00 2001 +From 3b2dff6c4d17c6adeba8304f30334e93db611233 Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 4 Jul 2019 12:08:17 +0800 -Subject: [PATCH 113/139] Malloc parameter check and judgment +Subject: [PATCH 113/140] 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 3493e5c..9e062df 100644 --- a/0114-lxc-fix-code-errors.patch +++ b/0114-lxc-fix-code-errors.patch @@ -1,7 +1,7 @@ -From 13cb946a0db26f50c017d7be52c091f0d3c82ae1 Mon Sep 17 00:00:00 2001 +From b51181f15bab3db7e4391b8eccad047221947baa Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 4 Jul 2019 05:10:00 -0400 -Subject: [PATCH 114/139] lxc: fix code errors +Subject: [PATCH 114/140] 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 2795724..39387ff 100644 --- a/0115-fix-compile-error-on-ubuntu.patch +++ b/0115-fix-compile-error-on-ubuntu.patch @@ -1,7 +1,7 @@ -From 6bffa764f1a5f78a9c0fb4beb024bd1b26eea5ce Mon Sep 17 00:00:00 2001 +From 4a03b0c529c8e2cf915c2b374a47e62b48c2d4db Mon Sep 17 00:00:00 2001 From: liuhao Date: Thu, 11 Jul 2019 17:42:00 +0800 -Subject: [PATCH 115/139] fix compile error on ubuntu +Subject: [PATCH 115/140] 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 7432344..6a4cde4 100644 --- a/0116-lxc-set-base-cgroup-path-to.patch +++ b/0116-lxc-set-base-cgroup-path-to.patch @@ -1,7 +1,7 @@ -From dd457c767956157e697ac3b384399ff71ed0673d Mon Sep 17 00:00:00 2001 +From c12b2a69ceb8fcd13cd2210897a3dc4d1e695189 Mon Sep 17 00:00:00 2001 From: liuhao Date: Wed, 19 Jun 2019 16:48:50 +0800 -Subject: [PATCH 116/139] lxc: set base cgroup path to '/' +Subject: [PATCH 116/140] 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 cb0b46e..5165b7d 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 a1c8c0461a87143e6bb9fdc8fabcf17811e94296 Mon Sep 17 00:00:00 2001 +From 86c8493bcd073a1b4fdc2cabde005811771bc282 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 31 Jul 2019 05:24:11 -0400 -Subject: [PATCH 117/139] pupulate device with dir mode 750 and set uid/gid +Subject: [PATCH 117/140] 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 8496bac..126f094 100644 --- a/0118-fix-sscanf-return-value-check.patch +++ b/0118-fix-sscanf-return-value-check.patch @@ -1,7 +1,7 @@ -From 703eeab29a903faa239be620fa3711e7d586e078 Mon Sep 17 00:00:00 2001 +From 8a9eddf2b23d4fc3541670e1257e5e1619aba0a6 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 2 Sep 2019 06:24:07 -0400 -Subject: [PATCH 118/139] fix sscanf return value check +Subject: [PATCH 118/140] fix sscanf return value check Signed-off-by: LiFeng --- diff --git a/0119-remove-unuse-binary.patch b/0119-remove-unuse-binary.patch index f5d3fee..85588b6 100644 --- a/0119-remove-unuse-binary.patch +++ b/0119-remove-unuse-binary.patch @@ -1,7 +1,7 @@ -From 4234dc19cd6e7922cf8220674b27e729d733ab37 Mon Sep 17 00:00:00 2001 +From 77c1a8421731f152a36a53147c7b66bd0e9f040f Mon Sep 17 00:00:00 2001 From: LiuHao Date: Wed, 4 Sep 2019 18:01:39 +0800 -Subject: [PATCH 119/139] remove unuse binary +Subject: [PATCH 119/140] remove unuse binary Signed-off-by: LiuHao --- diff --git a/0120-remove-unuse-unmount-namespace.patch b/0120-remove-unuse-unmount-namespace.patch index d2befff..33ea319 100644 --- a/0120-remove-unuse-unmount-namespace.patch +++ b/0120-remove-unuse-unmount-namespace.patch @@ -1,7 +1,7 @@ -From 72c3b292ff9a56c7ab5b98dcf2587b158be93628 Mon Sep 17 00:00:00 2001 +From 15dfe27d172680e3abe25af07a9477ca75f8e1d4 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Thu, 5 Sep 2019 11:48:57 +0800 -Subject: [PATCH 120/139] remove unuse unmount-namespace +Subject: [PATCH 120/140] 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 2dfd5a2..d61cc5f 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 522a7231efdb304cd84443b1211cddfd0b8c80b3 Mon Sep 17 00:00:00 2001 +From d4b8e904b6730f3eefa96878eca9e42219437c11 Mon Sep 17 00:00:00 2001 From: TanYifeng Date: Sat, 21 Sep 2019 06:19:25 -0400 -Subject: [PATCH 121/139] optimize log when root path is invalid +Subject: [PATCH 121/140] 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 98cf5cf..4e9b50b 100644 --- a/0122-lxc-fix-code-reivew-errors.patch +++ b/0122-lxc-fix-code-reivew-errors.patch @@ -1,7 +1,7 @@ -From 312d0ba4aa928b8ee666fbe1eb95c997b30d731e Mon Sep 17 00:00:00 2001 +From cb3044f47a1823994ee8133055ca6662cbe56838 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Thu, 26 Sep 2019 07:47:19 -0400 -Subject: [PATCH 122/139] lxc: fix code reivew errors +Subject: [PATCH 122/140] 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 bbb7088..0bfd9c7 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 40e603be55ed03d76e9ef1d82b57c05f15125f2c Mon Sep 17 00:00:00 2001 +From b6c3d8631ce628d2f71b4c2ff699c0bdeaed97a8 Mon Sep 17 00:00:00 2001 From: LiuHao Date: Mon, 25 Nov 2019 21:15:40 +0800 -Subject: [PATCH 123/139] in accordance with hook spec in oci +Subject: [PATCH 123/140] 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 b6e5029..170e7ef 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 3fed6c510fa597be32327e3e5aa2beb43a025553 Mon Sep 17 00:00:00 2001 +From 3478e45d5a8f25e0da6581004a6dc309cc47608d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 27 Nov 2019 22:33:46 -0500 -Subject: [PATCH 124/139] lxc: close maincmd fd before destroy cgroup +Subject: [PATCH 124/140] 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 5408c13..d28d50f 100644 --- a/0125-lxc-fix-strcat-bug-in-cleanpath.patch +++ b/0125-lxc-fix-strcat-bug-in-cleanpath.patch @@ -1,7 +1,7 @@ -From 16243e365367031f60e8ad4cf89f3014e999066e Mon Sep 17 00:00:00 2001 +From 6693cc04916b6f270c3a5e0316700350a18eb4c2 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 29 Nov 2019 22:16:05 -0500 -Subject: [PATCH 125/139] lxc: fix strcat bug in cleanpath +Subject: [PATCH 125/140] 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 52faf36..dedcec8 100644 --- a/0126-add-user-option-for-lxc-attach.patch +++ b/0126-add-user-option-for-lxc-attach.patch @@ -1,7 +1,7 @@ -From 7c3846e5c3e834821454766a45bced3e69bdfaab Mon Sep 17 00:00:00 2001 +From 60006b967762c1d57ca41981388bf685773e3e17 Mon Sep 17 00:00:00 2001 From: wujing Date: Wed, 30 Oct 2019 18:41:02 +0800 -Subject: [PATCH 126/139] add user option for lxc-attach +Subject: [PATCH 126/140] 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 9ca29a1..bf1da30 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 8eee379351a1c81f41c62c6416c29bb7b6af5968 Mon Sep 17 00:00:00 2001 +From de46120969e9d164bb2d4926c16414daafa86063 Mon Sep 17 00:00:00 2001 From: TanYifeng Date: Tue, 3 Dec 2019 22:43:25 -0500 -Subject: [PATCH 127/139] log: only write (size - begin) if buffer is full +Subject: [PATCH 127/140] 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 3d87437..f6ec562 100644 --- a/0128-link-proc-mounts-to-etc-mtab.patch +++ b/0128-link-proc-mounts-to-etc-mtab.patch @@ -1,7 +1,7 @@ -From a9e3f86bc53c0b10877bca2ab6b6de8451213cbe Mon Sep 17 00:00:00 2001 +From 2bca52aab48cf7337df9dfb64d20f55ceac3a9ff Mon Sep 17 00:00:00 2001 From: wujing Date: Tue, 10 Dec 2019 21:28:47 +0800 -Subject: [PATCH 128/139] link /proc/mounts to /etc/mtab +Subject: [PATCH 128/140] 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 13a8c76..e1a6ee6 100644 --- a/0129-cgfsng-add-retry-for-enter-cgroup.patch +++ b/0129-cgfsng-add-retry-for-enter-cgroup.patch @@ -1,7 +1,7 @@ -From 708f4741d94b8e6e3e1df481aec76e2556b0cc5d Mon Sep 17 00:00:00 2001 +From 3a7ab52bf9def26650df4f47ade319a441a4dca7 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Tue, 10 Dec 2019 05:40:20 -0500 -Subject: [PATCH 129/139] cgfsng: add retry for enter cgroup +Subject: [PATCH 129/140] 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 04cbd20..a28e1f5 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 f3ca7bf8732a2afce69a9ecfaf942cbfb56503c2 Mon Sep 17 00:00:00 2001 +From c315e6e595e6e5796c148c52ae18b8ba9b053e08 Mon Sep 17 00:00:00 2001 From: wujing Date: Tue, 17 Dec 2019 21:24:24 +0800 -Subject: [PATCH 130/139] fix snprintf create abstract socket name bug +Subject: [PATCH 130/140] 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 ea377e4..dfcf9f1 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 35caf7a1f7ea9fb577254965e834b78d46f74e23 Mon Sep 17 00:00:00 2001 +From 720f6f1c128eaac5c37153cdc30f09e4b18785aa Mon Sep 17 00:00:00 2001 From: wujing Date: Wed, 18 Dec 2019 15:44:19 +0800 -Subject: [PATCH 131/139] fix commands and terminal memory leak bug +Subject: [PATCH 131/140] 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 05dc5aa..29afe33 100644 --- a/0132-lxc-fix-bug-in-cgroup-parent.patch +++ b/0132-lxc-fix-bug-in-cgroup-parent.patch @@ -1,7 +1,7 @@ -From b71bd40c8f5bc8615ead8b95e142645174049757 Mon Sep 17 00:00:00 2001 +From 293ee3f82a8236de0a3b66c818b957f0a71c30d7 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 18 Dec 2019 06:00:58 -0500 -Subject: [PATCH 132/139] lxc: fix bug in cgroup-parent +Subject: [PATCH 132/140] 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 72c6ba0..21810a0 100644 --- a/0133-lxc-fix-bug-in-cgfsng.patch +++ b/0133-lxc-fix-bug-in-cgfsng.patch @@ -1,7 +1,7 @@ -From 02a2ab6454fe0d4012d9394599b0882fca92a91a Mon Sep 17 00:00:00 2001 +From 8b3ba34aad74f1bf204095a479c9d28436de2627 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 18 Dec 2019 09:01:25 -0500 -Subject: [PATCH 133/139] lxc: fix bug in cgfsng +Subject: [PATCH 133/140] 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 51e78cc..f68e923 100644 --- a/0134-lxc-do-cpuset-same-as-runc.patch +++ b/0134-lxc-do-cpuset-same-as-runc.patch @@ -1,7 +1,7 @@ -From e65cb8ae214d26225acb853bfb628b1b7e0a825f Mon Sep 17 00:00:00 2001 +From 646b70518ca8f512372996888f3c8b47577b59d5 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Wed, 18 Dec 2019 22:37:08 -0500 -Subject: [PATCH 134/139] lxc: do cpuset same as runc +Subject: [PATCH 134/140] 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 9b654ee..8c00226 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 5585a4c925088485b0d71b95c942973c31398154 Mon Sep 17 00:00:00 2001 +From 5d7175b7d6ac7340c779c0102955f2099fc7b7e9 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 23 Dec 2019 03:20:14 -0500 -Subject: [PATCH 135/139] lxc: fix code warnings for cgfsng.c +Subject: [PATCH 135/140] 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 6af5ddd..22c9d1c 100644 --- a/0136-lxc-fix-retry-bug-in-cgroup.patch +++ b/0136-lxc-fix-retry-bug-in-cgroup.patch @@ -1,7 +1,7 @@ -From dc42e8b5cfff32253cf1e1152814b8a2da77c8c0 Mon Sep 17 00:00:00 2001 +From 8f8184392cd877ae05e6f02529135b1900424812 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Sat, 28 Dec 2019 20:12:57 -0500 -Subject: [PATCH 136/139] lxc: fix retry bug in cgroup +Subject: [PATCH 136/140] 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 1d646f9..5f23daf 100644 --- a/0137-lxc-fix-bug-in-read-proc.patch +++ b/0137-lxc-fix-bug-in-read-proc.patch @@ -1,7 +1,7 @@ -From b0164257a8f7e815e43fd6e586e1f30ee3ebd1dd Mon Sep 17 00:00:00 2001 +From e80ccf614ff53e8fa6afe894bd167873b410adc4 Mon Sep 17 00:00:00 2001 From: LiFeng Date: Mon, 30 Dec 2019 04:50:28 -0500 -Subject: [PATCH 137/139] lxc: fix bug in read proc +Subject: [PATCH 137/140] 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 0a256d6..62011cb 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 29c845fe630204d35b300241a47ccd4525d315f9 Mon Sep 17 00:00:00 2001 +From d51a587ee6a9ba82e52f5f1a61191e257865041d Mon Sep 17 00:00:00 2001 From: LiFeng Date: Fri, 29 Nov 2019 22:12:10 -0500 -Subject: [PATCH 138/139] resize: implement resize function in exec/start +Subject: [PATCH 138/140] 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 index 42aa76b..f90d66e 100644 --- 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 @@ -1,7 +1,7 @@ -From b98cb4cc297ab4b7a6da6b9e7096abf1a06656d4 Mon Sep 17 00:00:00 2001 +From ee58496252e6b6874cbd09191fc8bec5216c95be 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 +Subject: [PATCH 139/140] lxc: fix get cgroup path by config instead of cmd Signed-off-by: LiFeng --- diff --git a/0140-lxc-remove-umask-when-populate-devices.patch b/0140-lxc-remove-umask-when-populate-devices.patch new file mode 100644 index 0000000..6d3efdc --- /dev/null +++ b/0140-lxc-remove-umask-when-populate-devices.patch @@ -0,0 +1,110 @@ +From 22613294ae751f47409cfac03a7fd28cf9222031 Mon Sep 17 00:00:00 2001 +From: LiFeng +Date: Fri, 28 Feb 2020 22:59:05 -0500 +Subject: [PATCH 140/140] lxc: remove umask when populate devices + +Signed-off-by: LiFeng +--- + src/lxc/conf.c | 38 ++++++++++++++++++++++++++------------ + 1 file changed, 26 insertions(+), 12 deletions(-) + +diff --git a/src/lxc/conf.c b/src/lxc/conf.c +index b66e7bc..65b33ea 100644 +--- a/src/lxc/conf.c ++++ b/src/lxc/conf.c +@@ -4008,23 +4008,28 @@ static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list + mode_t file_mode = 0; + struct lxc_populate_devs *dev_elem = NULL; + struct lxc_list *it = NULL; ++ mode_t cur_mask; + + INFO("Populating devices into container"); ++ cur_mask = umask(0000); + lxc_list_for_each(it, devs) { + dev_elem = it->elem; + + ret = snprintf(path, MAXPATHLEN, "%s/%s", rootfs->path ? rootfs->mount : "", dev_elem->name); +- if (ret < 0 || ret >= MAXPATHLEN) +- return -1; ++ if (ret < 0 || ret >= MAXPATHLEN) { ++ ret = -1; ++ goto reset_umask; ++ } + + /* create any missing directories */ + pathdirname = safe_strdup(path); + pathdirname = dirname(pathdirname); +- ret = mkdir_p(pathdirname, 0750); ++ ret = mkdir_p(pathdirname, 0755); + free(pathdirname); + if (ret < 0) { + WARN("Failed to create target directory"); +- return -1; ++ ret = -1; ++ goto reset_umask; + } + + if (!strcmp(dev_elem->type, "c")) { +@@ -4033,7 +4038,8 @@ static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list + file_mode = dev_elem->file_mode | S_IFBLK; + } else { + ERROR("Failed to parse devices type '%s'", dev_elem->type); +- return -1; ++ ret = -1; ++ goto reset_umask; + } + + DEBUG("Try to mknod '%s':'%d':'%d':'%d'\n", path, +@@ -4045,34 +4051,42 @@ static int setup_populate_devs(const struct lxc_rootfs *rootfs, struct lxc_list + file_mode, dev_elem->maj, dev_elem->min); + + char hostpath[MAXPATHLEN]; +- FILE *pathfile; ++ FILE *pathfile = NULL; + + // Unprivileged containers cannot create devices, so + // try to bind mount the device from the host + ret = snprintf(hostpath, MAXPATHLEN, "/dev/%s", dev_elem->name); +- if (ret < 0 || ret >= MAXPATHLEN) +- return -1; ++ if (ret < 0 || ret >= MAXPATHLEN) { ++ ret = -1; ++ goto reset_umask; ++ } + pathfile = lxc_fopen(path, "wb"); + if (!pathfile) { + SYSERROR("Failed to create device mount target '%s'", path); +- return -1; ++ ret = -1; ++ goto reset_umask; + } + fclose(pathfile); + if (safe_mount(hostpath, path, 0, MS_BIND, NULL, + rootfs->path ? rootfs->mount : NULL) != 0) { + SYSERROR("Failed bind mounting device %s from host into container", + dev_elem->name); +- return -1; ++ ret = -1; ++ goto reset_umask; + } + } + if (chown(path, dev_elem->uid, dev_elem->gid) < 0) { + ERROR("Error chowning %s", path); +- return -1; ++ ret = -1; ++ goto reset_umask; + } + } + ++reset_umask: ++ (void)umask(cur_mask); ++ + INFO("Populated devices into container /dev"); +- return 0; ++ return ret; + } + + // isulad: setup rootfs mountopts +-- +1.8.3.1 + diff --git a/lxc.spec b/lxc.spec index 95834a6..c6f6821 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,4 +1,4 @@ -%global _release 20200214 +%global _release 20200302 %global debug_package %{nil} Name: lxc @@ -148,6 +148,7 @@ 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 +Patch9142: 0140-lxc-remove-umask-when-populate-devices.patch BuildRequires: systemd-units git libtool graphviz docbook2X doxygen chrpath BuildRequires: pkgconfig(libseccomp) @@ -216,6 +217,7 @@ This package contains documentation for lxc for creating containers. %install %{make_install} mkdir -p %{buildroot}%{_sharedstatedir}/%{name} +mkdir -p %{buildroot}%{_datadir}/%{name}/__pycache__ for file in $(find %{buildroot}/usr/bin/lxc-* -type f -exec file {} ';' | grep "\" | grep -vE "*\.static" | awk -F ':' '{print $1}') do @@ -250,8 +252,10 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/%{name} rm -rf %{buildroot}%{_libdir}/liblxc.la rm -rf %{buildroot}%{_sbindir}/init.%{name}.static rm -rf %{buildroot}%{_sysconfdir}/default/%{name} +rm -rf %{buildroot}%{_datadir}/%{name}/__pycache__ %check make check +rm -rf %{buildroot}%{_datadir}/%{name}/__pycache__ %post @@ -276,6 +280,7 @@ make check %{_sharedstatedir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/default.conf +%config(noreplace) %{_sysconfdir}/lxc/* %dir %{_pkgdocdir} %{_pkgdocdir}/AUTHORS -- Gitee