daandemeyer / rpms / systemd

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