cryptsetup: allow x-systemd.device-timeout

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

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 1db5f8fb626802a2a7b9e75d7411abb41763e38d..5d5b6a0a61cc3b5d30caecd07fc6685fa9e97637 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -108,7 +108,7 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher
                 timeout = start + 25;
         else {
                 if (filtered) {
                 timeout = start + 25;
         else {
                 if (filtered) {

-                        *filtered = strdup(opts);
+                        *filtered = strdup(opts ?: "");

                         if (!*filtered)
                                 return log_oom();
                 }
                         if (!*filtered)
                                 return log_oom();
                 }


@@ -146,6 +146,9 @@ int generator_write_timeouts(const char *dir, const char *what, const char *wher
         if (!unit)
                 return -ENOMEM;
 
         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=%u",
+                                    program_invocation_short_name,
+                                    u / USEC_PER_SEC);

 }
 }