summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2015-11-26 22:36:21 +0100
committerFranck Bui <fbui@suse.com>2015-12-11 10:02:32 +0100
commit10c71477e934bcf0d83ea2ea5fa560d017f00243 (patch)
tree96e2e35cabf9ae007f6f51190525d64002c2f6f0
parent1dd9088a19f67fbadfbb10d8d668ab3eb6fa0df6 (diff)
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.
-rw-r--r--src/shared/generator.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/shared/generator.c b/src/shared/generator.c
index 37de3f7cb1..76808cbdd5 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);
}