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

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 762033bbd..465e5f6cc 100644
--- 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("Checking was requested for %s, but fsck.%s does not exist: %s", what, fstype, strerror(-r));
+                        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("Checking was requested for %s, but fsck.%s cannot be used: %s", what, fstype, strerror(-r));
-                        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;
@@ -97,7 +93,7 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher
          * user input, like crypto devices. */
 
         _cleanup_free_ char *node = NULL, *unit = NULL, *t = NULL;
-        char *prefix, *start, *timeout, *postfix;
+        char *start, *timeout;
         usec_t u;
         int r;
         size_t len;
@@ -107,9 +103,11 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher
         else if ((start = mount_test_option(opts, "x-systemd.device-timeout")))
                 timeout = start + 25;
         else {
-                *filtered = strdup(opts);
-                if (!*filtered)
-                        return log_oom();
+                if (filtered) {
+                        *filtered = strdup(opts ?: "");
+                        if (!*filtered)
+                                return log_oom();
+                }
 
                 return 0;
         }
@@ -119,11 +117,15 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher
         if (!t)
                 return -ENOMEM;
 
-        prefix = strndupa(opts, start - opts - (start != opts));
-        postfix = timeout + len + (timeout[len] != '\0');
-        *filtered = strjoin(prefix, *postfix ? postfix : NULL, NULL);
-        if (!*filtered)
-                return log_oom();
+        if (filtered) {
+                char *prefix, *postfix;
+
+                prefix = strndupa(opts, start - opts - (start != opts));
+                postfix = timeout + len + (start == opts && timeout[len] != '\0');
+                *filtered = strjoin(prefix, *postfix ? postfix : NULL, NULL);
+                if (!*filtered)
+                        return log_oom();
+        }
 
         r = parse_sec(t, &u);
         if (r < 0) {
@@ -140,6 +142,9 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher
         if (!unit)
                 return -ENOMEM;
 
-        return write_drop_in_format(dir, unit, "device-timeout",
-                                    "[Unit]\nJobTimeoutSec=%u", u / USEC_PER_SEC);
+        return write_drop_in_format(dir, unit, 50, "device-timeout",
+                                    "# Automatically generated by %s\n\n"
+                                    "[Unit]\nJobTimeoutSec=" USEC_FMT,
+                                    program_invocation_short_name,
+                                    u / USEC_PER_SEC);
 }