From 1dd9088a19f67fbadfbb10d8d668ab3eb6fa0df6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 11 Dec 2015 09:55:17 +0100 Subject: [PATCH 1/2] hashmap: re-add missing header file pthread.h Commit 11c3a36649e5e removed pthread.h inclusion in src/basic/hashmap.c but this header file is neeeded when ENABLE_DEBUG_HASHMAP is defined. --- src/basic/hashmap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c index b3954e3223..286ddfef5b 100644 --- a/src/basic/hashmap.c +++ b/src/basic/hashmap.c @@ -37,6 +37,7 @@ #include "util.h" #ifdef ENABLE_DEBUG_HASHMAP +#include #include "list.h" #endif From 10c71477e934bcf0d83ea2ea5fa560d017f00243 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 26 Nov 2015 22:36:21 +0100 Subject: [PATCH 2/2] 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. --- src/shared/generator.c | 5 ++--- 1 file 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); }