X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fgenerator.c;h=465e5f6cc8c66ab545faac2cc2c7d17b2ac5792b;hb=086821244b5113f00a0ef993b78dc56aae2a8f6c;hp=f54bb06f684da3b9e90add253e73c2362551c72e;hpb=da927ba997d68401563b927f92e6e40e021a8e5c;p=elogind.git

diff --git a/src/shared/generator.c b/src/shared/generator.c
index f54bb06f6..465e5f6cc 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -54,10 +54,8 @@ int generator_write_fsck_deps(
                         /* treat missing check as essentially OK */
                         log_debug_errno(r, "Checking was requested for %s, but fsck.%s does not exist: %m", what, fstype);
                         return 0;
-                } else if (r < 0) {
-                        log_warning_errno(r, "Checking was requested for %s, but fsck.%s cannot be used: %m", what, fstype);
-                        return r;
-                }
+                } else if (r < 0)
+                        return log_warning_errno(r, "Checking was requested for %s, but fsck.%s cannot be used: %m", what, fstype);
         }
 
         if (streq(where, "/")) {
@@ -66,10 +64,8 @@ int generator_write_fsck_deps(
                 lnk = strappenda(dest, "/" SPECIAL_LOCAL_FS_TARGET ".wants/systemd-fsck-root.service");
 
                 mkdir_parents(lnk, 0755);
-                if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-fsck-root.service", lnk) < 0) {
-                        log_error("Failed to create symlink %s: %m", lnk);
-                        return -errno;
-                }
+                if (symlink(SYSTEM_DATA_UNIT_PATH "/systemd-fsck-root.service", lnk) < 0)
+                        return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
 
         } else {
                 _cleanup_free_ char *fsck = NULL;