Fix regression caused by SVN 34522

3 files changed, 6 insertions, 1 deletions

diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 889a4ab4f..7b79b554e 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -7,13 +7,13 @@ TOPOLOGY = RANDOM
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
 
 [arm]
-DEFAULTSERVICES = core transport test-barriers
 PORT = 12366
 
 [test-barriers]
 AUTOSTART = NO
 PORT = 12114
 BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
+FORCESTART = YES
 
 [fs]
 AUTOSTART = NO
@@ -38,6 +38,7 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
+FORCESTART = YES
 
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -46,6 +47,7 @@ WAN_QUOTA_IN = 3932160
 [core]
 PORT = 12092
 AUTOSTART = YES
+FORCESTART = YES
 USE_EPHEMERAL_KEYS = NO
 
 [transport-udp]
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index f7c9b7c76..296c2b0dc 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -15,6 +15,7 @@ PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
+FORCESTART = YES
 
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -22,6 +23,7 @@ WAN_QUOTA_IN = 3932160
 
 [core]
 USE_EPHEMERAL_KEYS = NO
+FORCESTART = YES
 
 [transport-udp]
 TIMEOUT = 300 s
diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in
index f1ae59ac8..4da34b89b 100644
--- a/src/testbed/test_testbed_underlay.conf.in
+++ b/src/testbed/test_testbed_underlay.conf.in
@@ -7,6 +7,7 @@ OPERATION_TIMEOUT = 5 s
 [testbed-underlay]
 AUTOSTART = NO
 DBFILE = /will/be/overwritten/by/testcase
+FORCESTART = YES
 
 [dv]
 AUTOSTART = NO