X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fdbus1-generator%2Fdbus1-generator.c;h=a459c8450f4e6b13e2b4780fe17e366ff01b91a3;hb=da927ba997d68401563b927f92e6e40e021a8e5c;hp=3c4522b5893cde3ee1d5338047b4e78d0831c498;hpb=0975b63fb31263e535a2d26ed41e66e23f468bc5;p=elogind.git

diff --git a/src/dbus1-generator/dbus1-generator.c b/src/dbus1-generator/dbus1-generator.c
index 3c4522b58..a459c8450 100644
--- a/src/dbus1-generator/dbus1-generator.c
+++ b/src/dbus1-generator/dbus1-generator.c
@@ -103,7 +103,7 @@ static int create_dbus_files(
 
                 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;
         }
 
@@ -319,7 +319,7 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-        if (access("/dev/kdbus/control", F_OK) < 0)
+        if (access("/sys/fs/kdbus/control", F_OK) < 0)
                 return 0;
 
         r = cg_pid_get_owner_uid(0, NULL);
@@ -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;
         }