From 9e5548644f76e893c246d54ae613856b67b8dc1d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Dec 2013 00:07:49 +0100 Subject: bus: connect directly via kdbus in sd_bus_open_system_container() kdbus fortunately exposes the container's busses in the host fs, hence we can access it directly instead of doing the namespacing dance. --- src/nspawn/nspawn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nspawn/nspawn.c') diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 583912f57c..b3ca10ea91 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1067,6 +1067,7 @@ int main(int argc, char *argv[]) { _cleanup_close_pipe_ int kmsg_socket_pair[2] = { -1, -1 }; _cleanup_fdset_free_ FDSet *fds = NULL; _cleanup_free_ char *kdbus_namespace = NULL; + const char *ns; log_parse_environment(); log_open(); @@ -1167,7 +1168,8 @@ int main(int argc, char *argv[]) { goto finish; } - kdbus_fd = bus_kernel_create_namespace(arg_machine, &kdbus_namespace); + ns = strappenda("machine-", arg_machine); + kdbus_fd = bus_kernel_create_namespace(ns, &kdbus_namespace); if (r < 0) log_debug("Failed to create kdbus namespace: %s", strerror(-r)); else -- cgit v1.2.3-54-g00ecf