[CRIU] [PATCH 5/9] unix: Collect images before opening mountpoints

Cyrill Gorcunov gorcunov at gmail.com
Sat Jun 9 16:26:07 MSK 2018


Because we need to gather unix sockets earlier than
we start creating mount tree. Thus we will be able
to handle bindmounted sockets.

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.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 645a0e724970..e1571a6ed4d5 100644
--- a/criu/cr-restore.c
+++ b/criu/cr-restore.c
@@ -277,7 +277,6 @@ static struct collect_image_info *cinfos[] = {
 };
 
 static struct collect_image_info *cinfos_files[] = {
-	&unix_sk_cinfo,
 	&fifo_cinfo,
 	&pipe_cinfo,
 	&nsfile_cinfo,
@@ -300,6 +299,7 @@ static struct collect_image_info *cinfos_files[] = {
 static struct collect_image_info *before_ns_cinfos[] = {
 	&tty_info_cinfo, /* Restore devpts content */
 	&tty_cdata,
+	&unix_sk_cinfo,
 };
 
 static struct pprep_head *post_prepare_heads = NULL;
-- 
2.14.4



More information about the CRIU mailing list