From 4d7153e7a425f0ff94574fcf4a93f698bbc5dac9 Mon Sep 17 00:00:00 2001 From: WangFengTu Date: Wed, 2 Mar 2022 14:15:20 +0800 Subject: [PATCH] parse userns-remap in daemmon.json Signed-off-by: WangFengTu --- 0001-parse-userns-remap-in-daemmon.json.patch | 27 +++++++++++++++++++ lcr.spec | 10 ++++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-parse-userns-remap-in-daemmon.json.patch diff --git a/0001-parse-userns-remap-in-daemmon.json.patch b/0001-parse-userns-remap-in-daemmon.json.patch new file mode 100644 index 0000000..e2324ad --- /dev/null +++ b/0001-parse-userns-remap-in-daemmon.json.patch @@ -0,0 +1,27 @@ +From b81f5bb96474bbe6b3afb36dcdbe9ddc27597a53 Mon Sep 17 00:00:00 2001 +From: HumbleHunger <2495970924@qq.com> +Date: Thu, 5 Aug 2021 17:40:12 +0800 +Subject: [PATCH] parse userns-remap in daemmon.json + +Signed-off-by: HumbleHunger <2495970924@qq.com> +--- + src/json/schema/isulad-daemon-configs.json | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/json/schema/isulad-daemon-configs.json b/src/json/schema/isulad-daemon-configs.json +index 1134d37..54946c8 100644 +--- a/src/json/schema/isulad-daemon-configs.json ++++ b/src/json/schema/isulad-daemon-configs.json +@@ -61,6 +61,9 @@ + "enable-plugins": { + "type": "string" + }, ++ "userns-remap": { ++ "type": "string" ++ }, + "cpu-rt-period": { + "type": "int64" + }, +-- +2.25.1 + diff --git a/lcr.spec b/lcr.spec index 6f06a95..70842a0 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.0.7 -%global _release 1 +%global _release 2 %global _inner_name isula_libutils Name: lcr @@ -12,6 +12,8 @@ Group: Applications/System License: LGPLv2.1+ BuildRoot: %{_tmppath}/lcr-%{version} +Patch0001: 0001-parse-userns-remap-in-daemmon.json.patch + %define lxcver 4.0.3-2021112501 BuildRequires: cmake gcc gcc-c++ git @@ -99,6 +101,12 @@ rm -rf %{buildroot} %{_includedir}/%{_inner_name}/*.h %changelog +* Wed Mar 02 2022 wangfengtu - 2.0.7-2 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: parse userns-remap in daemmon.json + * Thu Feb 24 2022 wangfengtu - 2.0.7-1 - Type:enhancement - ID:NA