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

machined,bus-proxy: fix connecting to containers

This commit is contained in:
Lennart Poettering 2015-01-04 22:20:22 +01:00
parent 8531ae707d
commit 146d477367
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bus-proxyd/bus-proxyd.c
View File

@ -139,9 +139,9 @@ static int parse_argv(int argc, char *argv[]) {
return log_oom();
#ifdef ENABLE_KDBUS
a = strjoin("x-container-kernel:machine=", e, ";x-container-unix:machine=", e, NULL);
a = strjoin("x-machine-kernel:machine=", e, ";x-machine-unix:machine=", e, NULL);
#else
a = strjoin("x-container-unix:machine=", e, NULL);
a = strjoin("x-machine-unix:machine=", e, NULL);
#endif
if (!a)
return log_oom();

4
src/libsystemd/sd-bus/sd-bus.c
View File

@ -952,7 +952,7 @@ static int bus_parse_next_address(sd_bus *b) {
break;
} else if (startswith(a, "x-machine-unix:")) {
a += 17;
a += 15;
r = parse_container_unix_address(b, &a, &guid);
if (r < 0)
return r;
@ -960,7 +960,7 @@ static int bus_parse_next_address(sd_bus *b) {
break;
} else if (startswith(a, "x-machine-kernel:")) {
a += 19;
a += 17;
r = parse_container_kernel_address(b, &a, &guid);
if (r < 0)
return r;

4
src/machine/machine-dbus.c
View File

@ -463,9 +463,9 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
return r;
#ifdef ENABLE_KDBUS
asprintf(&container_bus->address, "x-container-kernel:pid=" PID_FMT ";x-container-unix:pid=" PID_FMT, m->leader, m->leader);
asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT ";x-machine-unix:pid=" PID_FMT, m->leader, m->leader);
#else
asprintf(&container_bus->address, "x-container-kernel:pid=" PID_FMT, m->leader);
asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT, m->leader);
#endif
if (!container_bus->address)
return -ENOMEM;