The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/3345
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) ===
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
From 52520e4f793f73e5956c2d9de9c83f074622ce1d Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Mon, 30 Mar 2020 22:26:10 +0200
Subject: [PATCH 1/2] start: remove unnecessary check for valid cgroup_ops
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
src/lxc/start.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lxc/start.c b/src/lxc/start.c
index 328516c976..5f70bf2379 100644
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -933,10 +933,8 @@ void lxc_end(struct lxc_handler *handler)
lsm_process_cleanup(handler->conf, handler->lxcpath);
- if (cgroup_ops) {
- cgroup_ops->payload_destroy(cgroup_ops, handler);
- cgroup_ops->monitor_destroy(cgroup_ops, handler);
- }
+ cgroup_ops->payload_destroy(cgroup_ops, handler);
+ cgroup_ops->monitor_destroy(cgroup_ops, handler);
if (handler->conf->reboot == REBOOT_NONE) {
/* For all new state clients simply close the command socket.
From f553c217467b26c6e134f8060d7635b4e0a20128 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brau...@ubuntu.com>
Date: Wed, 1 Apr 2020 22:25:53 +0200
Subject: [PATCH 2/2] autotools: don't install run-coccinelle.sh
Signed-off-by: Christian Brauner <christian.brau...@ubuntu.com>
---
coccinelle/Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/coccinelle/Makefile.am b/coccinelle/Makefile.am
index a3c8b03d95..059f5df41b 100644
--- a/coccinelle/Makefile.am
+++ b/coccinelle/Makefile.am
@@ -3,5 +3,3 @@
EXTRA_DIST = exit.cocci \
run-coccinelle.sh \
while-true.cocci
-
-bin_SCRIPTS = run-coccinelle.sh
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
