Merge pull request #1190 from poettering/rework-virt

basic: rework virtualization detection API
2015-09-08 15:53:56 +02:00
parent 4211d5bd13 75f86906c5
commit da323858ef
29 changed files with 335 additions and 312 deletions
@@ -3510,7 +3510,7 @@ int unit_kill_context(
                         * them.*/

                        if  (cg_unified() > 0 ||
-                             (detect_container(NULL) == 0 && !unit_cgroup_delegate(u)))
+                             (detect_container() == 0 && !unit_cgroup_delegate(u)))
                                wait_for_exit = true;

                        if (c->send_sighup && k != KILL_KILL) {