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

[Benjamin Franzke]

May I ask if this can be reviewed/applied?

Thanks,
Benjamin

2015-02-19 20:47 GMT+01:00 Benjamin Franzke <benjaminfranzke at googlemail.com>
:

> This fixes "machinectl login" on systems configured with --disable-kdbus.
>
> The error was:
> machinectl login foo
> Failed to get machine PTY: Input/output error
> ---
>  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
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/systemd-devel/attachments/20150228/a6275222/attachment.html>