From ac12cf5b7feb602da691f596bd4eade5fba9d005 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 7 Jan 2014 07:09:08 +0800 Subject: [PATCH] dbus1-generator: always pull proxy socket into sockets.target dbus.socket does that for --system, we need to explicitly pull it in for --user. --- src/dbus1-generator/dbus1-generator.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c index 5470bc94c..9457aed38 100644 --- a/src/dbus1-generator/dbus1-generator.c +++ b/src/dbus1-generator/dbus1-generator.c @@ -269,13 +269,20 @@ static int link_compatibility(const char *units) { f = strappenda(units, "/systemd-bus-proxyd.socket"); t = strappenda(arg_dest, "/" SPECIAL_DBUS_SOCKET); - mkdir_parents_label(t, 0755); if (symlink(f, t) < 0) { log_error("Failed to create symlink %s: %m", t); return -errno; } + f = strappenda(units, "/systemd-bus-proxyd.socket"); + t = strappenda(arg_dest, "/" SPECIAL_SOCKETS_TARGET ".wants/systemd-bus-proxyd.socket"); + mkdir_parents_label(t, 0755); + if (symlink(f, t) < 0) { + log_error("Failed to mask %s: %m", t); + return -errno; + } + t = strappenda(arg_dest, "/" SPECIAL_DBUS_SERVICE); if (symlink("/dev/null", t) < 0) { log_error("Failed to mask %s: %m", t); -- 2.30.2