The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3357
This e-mail was sent by the LXC bot, direct replies will not reach the author
unless they happen to be subscribed to this list.
=== Description (from pull-request) ===
From 20e9ea04257863ef5bbd3842aa28efb9bff1ba6e Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumil...@proxmox.com>
Date: Sun, 5 Apr 2020 15:55:28 +0200
Subject: [PATCH 1/2] confile: fix jump table order
Signed-off-by: Wolfgang Bumiller <w.bumil...@proxmox.com>
---
src/lxc/confile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index e7d5ae8296..3d7d9be50a 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -174,8 +174,8 @@ static struct lxc_config_t config_jump_table[] = {
{ "lxc.cap.keep", set_config_cap_keep,
get_config_cap_keep, clr_config_cap_keep,
},
{ "lxc.cgroup2", set_config_cgroup2_controller,
get_config_cgroup2_controller, clr_config_cgroup2_controller,
},
{ "lxc.cgroup.dir.monitor", set_config_cgroup_monitor_dir,
get_config_cgroup_monitor_dir, clr_config_cgroup_monitor_dir,
},
- { "lxc.cgroup.dir.container", set_config_cgroup_container_dir,
get_config_cgroup_container_dir, clr_config_cgroup_container_dir,
},
{
"lxc.cgroup.dir.container.inner",set_config_cgroup_container_inner_dir,
get_config_cgroup_container_inner_dir, clr_config_cgroup_container_inner_dir,},
+ { "lxc.cgroup.dir.container", set_config_cgroup_container_dir,
get_config_cgroup_container_dir, clr_config_cgroup_container_dir,
},
{ "lxc.cgroup.dir", set_config_cgroup_dir,
get_config_cgroup_dir, clr_config_cgroup_dir,
},
{ "lxc.cgroup.relative", set_config_cgroup_relative,
get_config_cgroup_relative, clr_config_cgroup_relative,
},
{ "lxc.cgroup", set_config_cgroup_controller,
get_config_cgroup_controller, clr_config_cgroup_controller,
},
From 29d652a9b9fafd464f314cc98c06c4cb1ad6a52f Mon Sep 17 00:00:00 2001
From: Wolfgang Bumiller <w.bumil...@proxmox.com>
Date: Sun, 5 Apr 2020 16:12:45 +0200
Subject: [PATCH 2/2] get the right path in get_cgroup command
Signed-off-by: Wolfgang Bumiller <w.bumil...@proxmox.com>
---
src/lxc/commands.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lxc/commands.c b/src/lxc/commands.c
index 5ac3f5d9c9..6309f68e02 100644
--- a/src/lxc/commands.c
+++ b/src/lxc/commands.c
@@ -579,8 +579,8 @@ static int lxc_cmd_get_cgroup_callback_do(int fd, struct
lxc_cmd_req *req,
reqdata = NULL;
}
- get_fn = (limiting_cgroup ? cgroup_ops->get_cgroup
- : cgroup_ops->get_limiting_cgroup);
+ get_fn = (limiting_cgroup ? cgroup_ops->get_limiting_cgroup
+ : cgroup_ops->get_cgroup);
path = get_fn(cgroup_ops, reqdata);
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
