util: introduce our own gperf based capability list

[elogind.git] / src / shared / generator.c

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 892fa39ec1c56abd62b20f42cb506d8c3b3cf15e..465e5f6cc8c66ab545faac2cc2c7d17b2ac5792b 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -52,12 +52,10 @@ int generator_write_fsck_deps(
                 r = fsck_exists(fstype);
                 if (r == -ENOENT) {
                         /* treat missing check as essentially OK */
-                        log_debug_errno(-r, "Checking was requested for %s, but fsck.%s does not exist: %m", what, fstype);
+                        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;