[systemd-commits] src/dbus1-generator

[Kay Sievers]

 src/dbus1-generator/dbus1-generator.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit ac12cf5b7feb602da691f596bd4eade5fba9d005
Author: Kay Sievers <kay at vrfy.org>
Date:   Tue Jan 7 07:09:08 2014 +0800

    dbus1-generator: always pull proxy socket into sockets.target
    
    dbus.socket does that for --system, we need to explicitly pull it
    in for --user.

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 5470bc9..9457aed 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);