The following pull request was submitted through Github.
It can be accessed and reviewed at: https://github.com/lxc/lxd/pull/5732

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 <[email protected]>
From f7db4bf41dfa03ee00a20407267d11cf63d508d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <[email protected]>
Date: Tue, 7 May 2019 15:09:49 -0400
Subject: [PATCH] lxd/containers: Don't fail on old libseccomp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <[email protected]>
---
 lxd/container_lxc.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxd/container_lxc.go b/lxd/container_lxc.go
index 249a33d382..508a8db697 100644
--- a/lxd/container_lxc.go
+++ b/lxd/container_lxc.go
@@ -1812,10 +1812,10 @@ func (c *containerLXC) initLXC(config bool) error {
        }
 
        if !c.IsPrivileged() && !c.state.OS.RunningInUserNS && 
lxc.HasApiExtension("seccomp_notify") && c.DaemonState().OS.SeccompListener {
-               err = lxcSetConfigItem(cc, "lxc.seccomp.notify.proxy", 
fmt.Sprintf("unix:%s", shared.VarPath("seccomp.socket")))
-               if err != nil {
-                       return err
-               }
+               // NOTE: Don't fail in cases where liblxc is recent enough but 
libseccomp isn't
+               //       when we add mount() support with user-configurable
+               //       options, we will want a hard fail if the user 
configured it
+               lxcSetConfigItem(cc, "lxc.seccomp.notify.proxy", 
fmt.Sprintf("unix:%s", shared.VarPath("seccomp.socket")))
        }
 
        // Apply raw.lxc
_______________________________________________
lxc-devel mailing list
[email protected]
http://lists.linuxcontainers.org/listinfo/lxc-devel

Reply via email to