diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-01-04 22:20:22 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-01-05 01:40:51 +0100 |
| commit | 146d47736780e06f618379a6c9f46edcf46803a7 (patch) | |
| tree | e16a7a7a09e6d96a38ec0afa11f3098d069b7487 | |
| parent | 8531ae707d4d0203e83304d4af948b8169a5fce1 (diff) | |
machined,bus-proxy: fix connecting to containers
| -rw-r--r-- | src/bus-proxyd/bus-proxyd.c | 4 | ||||
| -rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 4 | ||||
| -rw-r--r-- | src/machine/machine-dbus.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 6d9e1a031c..a7818f5462 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -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(); diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index f87c31651b..a8d03b8ac4 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -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; diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index cbdbc52a14..e7d4a3b3ce 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -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; |