|
|
|
|
From e02e6845a4c4abe7d79df4305810703af5e6ec21 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
|
|
|
|
|
Date: Thu, 19 Feb 2015 20:47:28 +0100
|
|
|
|
|
Subject: [PATCH] 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
|
|
|
|
|
|
|
|
|
|
(cherry picked from commit f2273101c21bc59a390379e182e53cd4f07a7e71)
|
|
|
|
|
---
|
|
|
|
|
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 b46f0a8dac..b0f0f66e09 100644
|
|
|
|
|
--- a/src/machine/machine-dbus.c
|
|
|
|
|
+++ b/src/machine/machine-dbus.c
|
|
|
|
|
@@ -477,7 +477,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 -ENOMEM;
|
