The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/7351
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: Stéphane Graber <stgra...@ubuntu.com>
From 3709620f86bdab0ef20b18355dfa4e73e0fef0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgra...@ubuntu.com>
Date: Mon, 11 May 2020 13:34:49 -0400
Subject: [PATCH] lxd/seccomp: Fix profile conflict between projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
lxd/seccomp/seccomp.go | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lxd/seccomp/seccomp.go b/lxd/seccomp/seccomp.go
index 8a7ddd0a66..0c78860b1a 100644
--- a/lxd/seccomp/seccomp.go
+++ b/lxd/seccomp/seccomp.go
@@ -19,6 +19,7 @@ import (
liblxc "gopkg.in/lxc/go-lxc.v2"
deviceConfig "github.com/lxc/lxd/lxd/device/config"
+ "github.com/lxc/lxd/lxd/project"
"github.com/lxc/lxd/lxd/state"
"github.com/lxc/lxd/lxd/ucred"
"github.com/lxc/lxd/lxd/util"
@@ -378,7 +379,7 @@ var seccompPath = shared.VarPath("security", "seccomp")
// ProfilePath returns the seccomp path for the instance.
func ProfilePath(c Instance) string {
- return path.Join(seccompPath, c.Name())
+ return path.Join(seccompPath, project.Instance(c.Project(), c.Name()))
}
// InstanceNeedsPolicy returns whether the instance needs a policy or not.
_______________________________________________
lxc-devel mailing list
lxc-devel@lists.linuxcontainers.org
http://lists.linuxcontainers.org/listinfo/lxc-devel
