[systemd-devel] [PATCH] machined: use x-machine-unix prefix for the container bus on dbus1

[Lennart Poettering]

On Thu, 19.02.15 20:47, Benjamin Franzke (benjaminfranzke at googlemail.com) wrote:

> This fixes "machinectl login" on systems configured with --disable-kdbus.
> 
> The error was:
> machinectl login foo
> Failed to get machine PTY: Input/output error

Looks good! Applied!

Sorry for the delay!

Thanks!

> ---
>  src/machine/machine-dbus.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
> index 116e711..2388c85 100644
> --- a/src/machine/machine-dbus.c
> +++ b/src/machine/machine-dbus.c
> @@ -512,7 +512,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();
> -- 
> 2.0.5
> 
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Lennart

-- 
Lennart Poettering, Red Hat