[07/19] unix: Collect images before opening mountpoints

Submitted by Cyrill Gorcunov on Sept. 14, 2018, 2:08 p.m.

Details

Message ID 20180914140842.6462-8-gorcunov@gmail.com
State New
Series "unix: Add support for bindmounted dgram sockets"
Headers show

Commit Message

Cyrill Gorcunov Sept. 14, 2018, 2:08 p.m.
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@gmail.com>
---
 criu/cr-restore.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/criu/cr-restore.c b/criu/cr-restore.c
index 45ed9c63a824..3e467aff3176 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;