From 861b8b00ade0ea53a3cc09ba9c5e53a0db619cca Mon Sep 17 00:00:00 2001 From: wujing Date: Sat, 15 Feb 2020 12:03:09 +0800 Subject: [PATCH] selinux context configuration item change adaptation Signed-off-by: wujing --- CMakeLists.txt | 2 +- lcr.spec | 4 ++-- src/conf.c | 2 +- src/lcrcontainer_extend.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ccd5725..c05169d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ include(cmake/set_build_flags.cmake) option(VERSION "set lcr version" ON) if (VERSION STREQUAL "ON") - set(LCR_VERSION "1.0.19") + set(LCR_VERSION "1.0.20") endif() option(DEBUG "set lcr gcc option" ON) diff --git a/lcr.spec b/lcr.spec index 7cfa320..31faf59 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ -%global _version 1.0.19 -%global _release 20200121.043807.gita1f42840 +%global _version 1.0.20 +%global _release 20200215.125545.git330d8cda Name: lcr Version: %{_version} Release: %{_release} diff --git a/src/conf.c b/src/conf.c index 2ba53fd..da7ac34 100644 --- a/src/conf.c +++ b/src/conf.c @@ -627,7 +627,7 @@ static int trans_oci_process_selinux(const oci_runtime_spec_process *proc, struc int ret = -1; if (proc->selinux_label != NULL) { - node = create_lcr_list_node("lxc.se_context", proc->selinux_label); + node = create_lcr_list_node("lxc.selinux.context", proc->selinux_label); if (node == NULL) { goto out; } diff --git a/src/lcrcontainer_extend.c b/src/lcrcontainer_extend.c index b49b66a..3fba20c 100644 --- a/src/lcrcontainer_extend.c +++ b/src/lcrcontainer_extend.c @@ -240,7 +240,7 @@ static int trans_hostname_hooks_process_mounts(struct lcr_list *lcr_conf, const * lxc.cap.{drop/keep} * lxc.limit.* * lxc.aa_profile - * lxc.se_context + * lxc.selinux.context */ node = trans_oci_process(container->process); if (node == NULL) { -- GitLab