Add SPDX license identifiers to source files under the LGPL

[thirdparty/systemd.git] / src / shared / generator.c

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 2f459bf778646d4e8c7f6dcb7efef25949e775da..a9670213d4f62d99accb6da48254a4911cde5e53 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   This file is part of systemd.
 
@@ -198,6 +199,10 @@ int generator_write_timeouts(
         node = fstab_node_to_udev_node(what);
         if (!node)
                 return log_oom();
+        if (!is_device_path(node)) {
+                log_warning("x-systemd.device-timeout ignored for %s", what);
+                return 0;
+        }
 
         r = unit_name_from_path(node, ".device", &unit);
         if (r < 0)
@@ -205,8 +210,10 @@ int generator_write_timeouts(
 
         return write_drop_in_format(dir, unit, 50, "device-timeout",
                                     "# Automatically generated by %s\n\n"
-                                    "[Unit]\nJobRunningTimeoutSec=%s",
-                                    program_invocation_short_name, timeout);
+                                    "[Unit]\n"
+                                    "JobRunningTimeoutSec=%s",
+                                    program_invocation_short_name,
+                                    timeout);
 }
 
 int generator_write_device_deps(
@@ -258,6 +265,10 @@ int generator_write_initrd_root_device_deps(const char *dir, const char *what) {
 
         return write_drop_in_format(dir, SPECIAL_INITRD_ROOT_DEVICE_TARGET, 50, "root-device",
                                     "# Automatically generated by %s\n\n"
-                                    "[Unit]\nRequires=%s\nAfter=%s",
-                                    program_invocation_short_name, unit, unit);
+                                    "[Unit]\n"
+                                    "Requires=%s\n"
+                                    "After=%s",
+                                    program_invocation_short_name,
+                                    unit,
+                                    unit);
 }