summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-06-15 11:45:48 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-15 11:45:48 +0200
commit5feece76fb55444f34cd8eb5394d0f079dab54de (patch)
tree97f3c11cd09ba10cb01c6cbdc87d343ddf6d3f72
parentbdfcbe226204c1c4b4ea8de16d7be376ac941c97 (diff)
parent9b1cbdc6e18ddeddc42df558e574322c64867b24 (diff)
Merge pull request #205 from endocode/iaguis/seccomp-v2
nspawn: make seccomp loading errors non-fatal
-rw-r--r--src/nspawn/nspawn.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 3f0b3d9182..2fc5f2f595 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3002,8 +3002,15 @@ static int setup_seccomp(void) {
}
r = seccomp_load(seccomp);
- if (r < 0)
+ if (r == -EINVAL) {
+ log_debug_errno(r, "Kernel is probably not configured with CONFIG_SECCOMP. Disabling seccomp audit filter: %m");
+ r = 0;
+ goto finish;
+ }
+ if (r < 0) {
log_error_errno(r, "Failed to install seccomp audit filter: %m");
+ goto finish;
+ }
finish:
seccomp_release(seccomp);