X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fdbus1-generator%2Fdbus1-generator.c;h=5d3b1a856afa8281b1066d427b7348c1f9e46ab6;hp=57af80c0e9e13aa23d0080dfe3682da54115dc6c;hb=e3afaf6b8e540d4c0dc5a7f0d5178ce29c1ac2a5;hpb=63cc4c3138fd0ce9cc97884373a2dd8959a13ee9

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 57af80c0e..5d3b1a856 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -86,7 +86,7 @@ static int create_dbus_files(
                         fprintf(f, "Environment=DBUS_STARTER_BUS_TYPE=%s\n", type);
 
                         if (streq(type, "system"))
-                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS=" DEFAULT_SYSTEM_BUS_PATH "\n");
+                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS=" DEFAULT_SYSTEM_BUS_ADDRESS "\n");
                         else if (streq(type, "session")) {
                                 char *run;
 
@@ -96,14 +96,14 @@ static int create_dbus_files(
                                         return -EINVAL;
                                 }
 
-                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS="KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT "\n",
+                                fprintf(f, "Environment=DBUS_STARTER_ADDRESS="KERNEL_USER_BUS_ADDRESS_FMT ";" UNIX_USER_BUS_ADDRESS_FMT "\n",
                                         getuid(), run);
                         }
                 }
 
                 r = fflush_and_check(f);
                 if (r < 0) {
-                        log_error("Failed to write %s: %s", a, strerror(-r));
+                        log_error_errno(r, "Failed to write %s: %m", a);
                         return r;
                 }
 
@@ -140,7 +140,7 @@ static int create_dbus_files(
 
         r = fflush_and_check(f);
         if (r < 0) {
-                log_error("Failed to write %s: %s", b, strerror(-r));
+                log_error_errno(r, "Failed to write %s: %m", b);
                 return r;
         }
 
@@ -332,7 +332,7 @@ int main(int argc, char *argv[]) {
                 type = "system";
                 units = SYSTEM_DATA_UNIT_PATH;
         } else {
-                log_error("Failed to determine whether we are running as user or system instance: %s", strerror(-r));
+                log_error_errno(r, "Failed to determine whether we are running as user or system instance: %m");
                 return r;
         }