picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: connect directly via kdbus in sd_bus_open_system_container()

Browse source 
kdbus fortunately exposes the container's busses in the host fs, hence
we can access it directly instead of doing the namespacing dance.
This commit is contained in:
Lennart Poettering 2013-12-12 00:07:49 +01:00
parent ba276c8153
commit 9e5548644f
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libsystemd-bus/sd-bus.c
View file

@ -1142,12 +1142,17 @@ _public_ int sd_bus_open_system_container(const char *machine, sd_bus **ret) {
assert_return(machine, -EINVAL);
assert_return(ret, -EINVAL);
assert_return(filename_is_safe(machine), -EINVAL);
e = bus_address_escape(machine);
if (!e)
return -ENOMEM;
#ifdef ENABLE_KDBUS
p = strjoin("kernel:path=/dev/kdbus/ns/machine-", e, "/0-system/bus;x-container:machine=", e, NULL);
#else
p = strjoin("x-container:machine=", e, NULL);
#endif
if (!p)
return -ENOMEM;

4
src/nspawn/nspawn.c
View file

@ -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