daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From e02e6845a4c4abe7d79df4305810703af5e6ec21 Mon Sep 17 00:00:00 2001
1ff636
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
1ff636
Date: Thu, 19 Feb 2015 20:47:28 +0100
1ff636
Subject: [PATCH] machined: use x-machine-unix prefix for the container bus on
1ff636
 dbus1
1ff636
1ff636
This fixes "machinectl login" on systems configured with --disable-kdbus.
1ff636
1ff636
The error was:
1ff636
machinectl login foo
1ff636
Failed to get machine PTY: Input/output error
1ff636
1ff636
(cherry picked from commit f2273101c21bc59a390379e182e53cd4f07a7e71)
1ff636
---
1ff636
 src/machine/machine-dbus.c | 2 +-
1ff636
 1 file changed, 1 insertion(+), 1 deletion(-)
1ff636
1ff636
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
c62b8e
index b46f0a8dac..b0f0f66e09 100644
1ff636
--- a/src/machine/machine-dbus.c
1ff636
+++ b/src/machine/machine-dbus.c
1ff636
@@ -477,7 +477,7 @@ int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *us
1ff636
 #ifdef ENABLE_KDBUS
1ff636
         asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT ";x-machine-unix:pid=" PID_FMT, m->leader, m->leader);
1ff636
 #else
1ff636
-        asprintf(&container_bus->address, "x-machine-kernel:pid=" PID_FMT, m->leader);
1ff636
+        asprintf(&container_bus->address, "x-machine-unix:pid=" PID_FMT, m->leader);
1ff636
 #endif
1ff636
         if (!container_bus->address)
1ff636
                 return -ENOMEM;