From aefeb8ebbcdcc1174b01515ca2aafa4304391532 Mon Sep 17 00:00:00 2001
From: Meike Hecker <mh@gmsk.de>
Date: Wed, 18 May 2016 10:48:11 +0200
Subject: [PATCH] setup_srv: have timeout configurable

---
 src/setup.erl     | 1 +
 src/setup_srv.erl | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/setup.erl b/src/setup.erl
index a42ef93..e6856c9 100644
--- a/src/setup.erl
+++ b/src/setup.erl
@@ -130,6 +130,7 @@
 %%    the environment variable `{verify_directories, false}'. This can be desirable
 %%    if setup is used mainly e.g. for environment variable expansion, but not for
 %%    disk storage.
+%% * `{timeout, integer()}' - time to wait for run_setup to finish
 %% @end
 -module(setup).
 
diff --git a/src/setup_srv.erl b/src/setup_srv.erl
index 4d7354a..a13da9a 100644
--- a/src/setup_srv.erl
+++ b/src/setup_srv.erl
@@ -31,7 +31,8 @@ start_link() ->
     gen_server:start_link({local, ?MODULE}, ?MODULE, [], []).
 
 run_setup() ->
-    gen_server:call(?MODULE, run_setup).
+    Timeout = setup:get_env(setup, timeout, 5000),
+    gen_server:call(?MODULE, run_setup, Timeout).
 
 init(_) ->
     {ok, []}.