[CRIU] Bad commit

[Cyrill Gorcunov]

On Thu, Aug 14, 2014 at 05:35:08PM +0400, Cyrill Gorcunov wrote:
> 
> because we're restoring container in own pid namespace passing clone-parent
> triggers this condition and we're hitting einval. Ideas?

Maybe something like

[cyrill at moon criu] git diff
diff --git a/cr-restore.c b/cr-restore.c
index bd16b1d81ca7..e6beeeea7469 100644
--- a/cr-restore.c
+++ b/cr-restore.c
@@ -1598,7 +1598,8 @@ static int restore_root_task(struct pstree_item *init)
         * dying once restored.
         */
        if (opts.swrk_restore || opts.restore_detach)
-               init->rst->clone_flags |= CLONE_PARENT;
+               if (!(root_ns_mask & CLONE_NEWPID))
+                       init->rst->clone_flags |= CLONE_PARENT;
 
        ret = fork_with_pid(init);
        if (ret < 0)
[cyrill at moon criu] 

would do the trick?

	Cyrill