[systemd-commits] src/machine

Lennart Poettering lennart at kemper.freedesktop.org
Sun Mar 1 03:01:41 PST 2015


 src/machine/machine-dbus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f2273101c21bc59a390379e182e53cd4f07a7e71
Author: Benjamin Franzke <benjaminfranzke at googlemail.com>
Date:   Thu Feb 19 20:47:28 2015 +0100

    machined: use x-machine-unix prefix for the container bus on dbus1
    
    This fixes "machinectl login" on systems configured with --disable-kdbus.
    
    The error was:
    machinectl login foo
    Failed to get machine PTY: Input/output error

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 15c9159..9e78a67 100644
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -511,7 +511,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
 #ifdef ENABLE_KDBUS
         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-machine-kernel:pid=" PID_FMT, m->leader);
+        asprintf(&container_bus->address, "x-machine-unix:pid=" PID_FMT, m->leader);
 #endif
         if (!container_bus->address)
                 return log_oom();



More information about the systemd-commits mailing list