summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2014-01-07 07:09:08 +0800
committerKay Sievers <kay@vrfy.org>2014-01-07 07:09:08 +0800
commitac12cf5b7feb602da691f596bd4eade5fba9d005 (patch)
tree6e78e3153d3b56d88da1d55a8ddd0f92baaacde6
parentca76186598c56da9f08b7eb55b6915d9e2344570 (diff)
dbus1-generator: always pull proxy socket into sockets.target
dbus.socket does that for --system, we need to explicitly pull it in for --user.
-rw-r--r--src/dbus1-generator/dbus1-generator.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 5470bc94c6..9457aed384 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);