bus: install systemd-bus-proxyd unit files for compatibility with dbus1

[elogind.git] / src / dbus1-generator / dbus1-generator.c

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index dd299edc75e8f62c0e7c5f118bd5fb08bab12c09..e86fc6e56aef2392a95d1961cf16848b91640d64 100644 (file)
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -28,7 +28,7 @@
 #include "unit-name.h"
 #include "cgroup-util.h"
 
 #include "unit-name.h"
 #include "cgroup-util.h"
 

-static const char *arg_dest = "/tmp";
+static const char *arg_dest_late = "/tmp", *arg_dest = "/tmp";

 
 static int create_dbus_files(
                 const char *path,
 
 static int create_dbus_files(
                 const char *path,


@@ -52,7 +52,7 @@ static int create_dbus_files(
                 if (!s)
                         return log_oom();
 
                 if (!s)
                         return log_oom();
 

-                a = strjoin(arg_dest, "/", s, NULL);
+                a = strjoin(arg_dest_late, "/", s, NULL);

                 if (!a)
                         return log_oom();
 
                 if (!a)
                         return log_oom();
 


@@ -98,7 +98,7 @@ static int create_dbus_files(
                 service = s;
         }
 
                 service = s;
         }
 

-        b = strjoin(arg_dest, "/", name, ".busname", NULL);
+        b = strjoin(arg_dest_late, "/", name, ".busname", NULL);

         if (!b)
                 return log_oom();
 
         if (!b)
                 return log_oom();
 


@@ -127,7 +127,7 @@ static int create_dbus_files(
                 return -errno;
         }
 
                 return -errno;
         }
 

-        lnk = strjoin(arg_dest, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);
+        lnk = strjoin(arg_dest_late, "/" SPECIAL_BUSNAMES_TARGET ".wants/", name, ".busname", NULL);

         if (!lnk)
                 return log_oom();
 
         if (!lnk)
                 return log_oom();
 


@@ -264,6 +264,21 @@ static int link_busnames_target(const char *units) {
         return 0;
 }
 
         return 0;
 }
 

+static int link_compatibility(const char *units) {
+        const char *f, *t;
+
+        f = strappenda(units, "/systemd-socket-proxy.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;
+        }
+
+        return 0;
+}
+

 int main(int argc, char *argv[]) {
         const char *path, *type, *units;
         int r, q;
 int main(int argc, char *argv[]) {
         const char *path, *type, *units;
         int r, q;


@@ -273,8 +288,10 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
                 return EXIT_FAILURE;
         }
 

-        if (argc > 1)
-                arg_dest = argv[3];
+        if (argc > 1) {
+                arg_dest = argv[1];
+                arg_dest_late = argv[3];
+        }

 
         log_set_target(LOG_TARGET_SAFE);
         log_parse_environment();
 
         log_set_target(LOG_TARGET_SAFE);
         log_parse_environment();


@@ -306,5 +323,9 @@ int main(int argc, char *argv[]) {
         if (q < 0)
                 r = q;
 
         if (q < 0)
                 r = q;
 

+        q = link_compatibility(units);
+        if (q < 0)
+                r = q;
+

         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }