]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fstab-gen: don't convert device timeout into seconds when initializing JobTimeoutSec 2137/head
authorFranck Bui <fbui@suse.com>
Thu, 26 Nov 2015 21:36:21 +0000 (22:36 +0100)
committerFranck Bui <fbui@suse.com>
Fri, 11 Dec 2015 09:02:32 +0000 (10:02 +0100)
There was no need for such conversion and it was actually wrong since
any device timeout less than a second was converted into 0 which means
waits forever.

src/shared/generator.c

index 37de3f7cb1847e7fa3424bfbfb8b706911fe505b..76808cbdd51c05e0ae95bc029594bb3a1978efca 100644 (file)
@@ -190,7 +190,6 @@ int generator_write_timeouts(
 
         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);
+                                    "[Unit]\nJobTimeoutSec=%s",
+                                    program_invocation_short_name, timeout);
 }