X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmachine-id-setup.c;h=671003820b77b2a815ddbf37a8b60be1ec096196;hb=a2c0e528b8b5ba370527db279605e4e4135689c1;hp=9ec93c25597251cd68b0b06062bee63bc117748b;hpb=da927ba997d68401563b927f92e6e40e021a8e5c;p=elogind.git

diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index 9ec93c255..671003820 100644
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -141,10 +141,8 @@ static int generate(char id[34], const char *root) {
 
         /* If that didn't work, generate a random machine id */
         r = sd_id128_randomize(&buf);
-        if (r < 0) {
-                log_error_errno(r, "Failed to open /dev/urandom: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to open /dev/urandom: %m");
 
         for (p = buf.bytes, q = id; p < buf.bytes + sizeof(buf); p++, q += 2) {
                 q[0] = hexchar(*p >> 4);
@@ -198,7 +196,7 @@ int machine_id_setup(const char *root) {
                                                   "2) /etc/machine-id exists and is empty.\n"
                                                   "3) /etc/machine-id is missing and /etc is writable.\n");
                                 else
-                                        log_error("Cannot open %s: %m", etc_machine_id);
+                                        log_error_errno(errno, "Cannot open %s: %m", etc_machine_id);
                                 return -errno;
                         }
 
@@ -206,10 +204,8 @@ int machine_id_setup(const char *root) {
                 }
         }
 
-        if (fstat(fd, &st) < 0) {
-                log_error("fstat() failed: %m");
-                return -errno;
-        }
+        if (fstat(fd, &st) < 0)
+                return log_error_errno(errno, "fstat() failed: %m");
 
         if (S_ISREG(st.st_mode))
                 if (loop_read(fd, id, 33, false) == 33 && id[32] == '\n') {
@@ -250,7 +246,7 @@ int machine_id_setup(const char *root) {
         /* And now, let's mount it over */
         r = mount(run_machine_id, etc_machine_id, NULL, MS_BIND, NULL);
         if (r < 0) {
-                log_error("Failed to mount %s: %m", etc_machine_id);
+                log_error_errno(errno, "Failed to mount %s: %m", etc_machine_id);
                 unlink_noerrno(run_machine_id);
                 return -errno;
         }
@@ -259,7 +255,7 @@ int machine_id_setup(const char *root) {
 
         /* Mark the mount read-only */
         if (mount(NULL, etc_machine_id, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, NULL) < 0)
-                log_warning("Failed to make transient %s read-only: %m", etc_machine_id);
+                log_warning_errno(errno, "Failed to make transient %s read-only: %m", etc_machine_id);
 
         return 0;
 }