[CRIU] [PATCH] Do not lock network if running in the host network namespace
Adrian Reber
adrian at lisas.de
Thu Nov 29 12:24:01 MSK 2018
From: Adrian Reber <areber at redhat.com>
Related: https://github.com/checkpoint-restore/criu/issues/577
Restoring a runc container which is running in the host's network
namespace locked the network (iptables-restore) without unlocking it.
This disables network logging if running in the host's network
namespace.
Suggested-by: Andrei Vagin <avagin at gmail.com>
Signed-off-by: Adrian Reber <areber at redhat.com>
---
criu/cr-restore.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 6086d65..d8fe352 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -2135,7 +2135,7 @@ static int restore_root_task(struct pstree_item *init)
goto out_kill;
}
- if (opts.empty_ns & CLONE_NEWNET) {
+ if (root_ns_mask & opts.empty_ns & CLONE_NEWNET) {
/*
* Local TCP connections were locked by network_lock_internal()
* on dump and normally should have been C/R-ed by respectively
--
1.8.3.1
More information about the CRIU
mailing list