Commit bd4e5d2f authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

restore: prepare shared objects after initializing namespaces

On this stage crtools unlink old socket files, create ghost files and etc,
so we should be in a correct namespace.
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 420325dc
...@@ -708,6 +708,10 @@ static int restore_task_with_children(void *_arg) ...@@ -708,6 +708,10 @@ static int restore_task_with_children(void *_arg)
mount_proc(); mount_proc();
} }
if (me == root_item)
if (prepare_shared())
exit(-1);
/* /*
* The block mask will be restored in sigresturn. * The block mask will be restored in sigresturn.
* *
...@@ -890,9 +894,6 @@ int cr_restore_tasks(pid_t pid, struct cr_options *opts) ...@@ -890,9 +894,6 @@ int cr_restore_tasks(pid_t pid, struct cr_options *opts)
if (prepare_pstree() < 0) if (prepare_pstree() < 0)
return -1; return -1;
if (prepare_shared() < 0)
return -1;
if (prepare_pstree_ids() < 0) if (prepare_pstree_ids() < 0)
return -1; return -1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment