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;
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;
}
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;
}
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;
}