parse userns-remap in daemmon.json

Signed-off-by: WangFengTu <wangfengtu@huawei.com>
This commit is contained in:
WangFengTu 2022-03-02 14:15:20 +08:00
parent 8e29980fe5
commit 4d7153e7a4
2 changed files with 36 additions and 1 deletions

View File

@ -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

View File

@ -1,5 +1,5 @@
%global _version 2.0.7 %global _version 2.0.7
%global _release 1 %global _release 2
%global _inner_name isula_libutils %global _inner_name isula_libutils
Name: lcr Name: lcr
@ -12,6 +12,8 @@ Group: Applications/System
License: LGPLv2.1+ License: LGPLv2.1+
BuildRoot: %{_tmppath}/lcr-%{version} BuildRoot: %{_tmppath}/lcr-%{version}
Patch0001: 0001-parse-userns-remap-in-daemmon.json.patch
%define lxcver 4.0.3-2021112501 %define lxcver 4.0.3-2021112501
BuildRequires: cmake gcc gcc-c++ git BuildRequires: cmake gcc gcc-c++ git
@ -99,6 +101,12 @@ rm -rf %{buildroot}
%{_includedir}/%{_inner_name}/*.h %{_includedir}/%{_inner_name}/*.h
%changelog %changelog
* Wed Mar 02 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-2
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: parse userns-remap in daemmon.json
* Thu Feb 24 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-1 * Thu Feb 24 2022 wangfengtu <wangfengtu@huawei.com> - 2.0.7-1
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA