From: Franck Bui <fbui@suse.com>
Date: Thu, 26 Nov 2015 21:36:21 +0000 (+0100)
Subject: fstab-gen: don't convert device timeout into seconds when initializing JobTimeoutSec
X-Git-Tag: v229~164^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10c71477e934bcf0d83ea2ea5fa560d017f00243;p=thirdparty%2Fsystemd.git

fstab-gen: don't convert device timeout into seconds when initializing JobTimeoutSec

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.
---

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 37de3f7cb18..76808cbdd51 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -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);
 }