Merge pull request #5420 from OpenDZ/tixxdz/namespace-fixes-v2

Namespace: RootImage= RootDirectory= and MountAPIVFS fixes
2017-05-09 20:42:32 +02:00
parent 6c1ff21b00 9c988f934b
commit 4e168f4606
3 changed files with 24 additions and 9 deletions
@@ -1670,7 +1670,7 @@ static bool exec_needs_mount_namespace(
            context->protect_control_groups)
                return true;

-        if (context->mount_apivfs)
+        if (context->mount_apivfs && (context->root_image || context->root_directory))
                return true;

        return false;