rename FORCESTART into IMMEDIATE_START (#4547b)

42 files changed, 129 insertions, 129 deletions

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index a6dccf3de..bc138e6fc 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -2062,7 +2062,7 @@ setup_service (void *cls,
   if (GNUNET_YES ==
       GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                             section,
-                                            "FORCESTART"))
+                                            "IMMEDIATE_START"))
   {
     sl->force_start = GNUNET_YES;
     if (GNUNET_YES ==
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index 8e4a8b1cf..2f4c6a6db 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -1,5 +1,5 @@
 [cadet]
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2096
 HOSTNAME = localhost
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index 4731617d4..5ad67fec2 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -68,33 +68,33 @@ NO_IO = YES
 WORKBITS = 0
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 42e06a66d..fa42c3c1a 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -17,22 +17,22 @@ BINARY = gnunet-service-evil-consensus
 RESOURCE_DIAGNOSTICS = resource.log.${PEERID:-master}
 
 [core]
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [zonemaster]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [cadet]
 #PREFIX = valgrind
diff --git a/src/core/test_core_api_send_to_self.conf b/src/core/test_core_api_send_to_self.conf
index 83928d04a..ad6d4dc60 100644
--- a/src/core/test_core_api_send_to_self.conf
+++ b/src/core/test_core_api_send_to_self.conf
@@ -7,7 +7,7 @@ WAN_QUOTA_IN = 104857600
 WAN_QUOTA_OUT = 104757600
 
 [test-sts]
-FORCESTART = YES
+IMMEDIATE_START = YES
 PORT = 9252
 HOSTNAME = localhost
 BINARY = test_core_api_send_to_self
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index 9ae6d630b..405ef1917 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,5 +1,5 @@
 [dht]
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2095
 HOSTNAME = localhost
diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index c3621cda5..0e546cf68 100644
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -5,7 +5,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index 3a9857cff..cb875fad4 100644
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -37,7 +37,7 @@ EXTERNAL_ADDRESS = 127.0.0.1
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [nse]
 START_ON_DEMAND = YES
diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index 64dc243e0..230aa0fa4 100644
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -34,7 +34,7 @@ USE_LOCALADDR = NO
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [nse]
 START_ON_DEMAND = YES
diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 8e48b1165..62e337ef2 100644
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -5,7 +5,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index 26052555e..feefc2f5e 100644
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -32,7 +32,7 @@ RETURN_LOCAL_ADDRESSES = YES
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [nse]
 START_ON_DEMAND = YES
diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 725373900..ac35664c4 100644
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -3,7 +3,7 @@
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf
index f13c9a66a..05f7cc0e6 100644
--- a/src/dht/test_dht_tools.conf
+++ b/src/dht/test_dht_tools.conf
@@ -31,7 +31,7 @@ USE_LOCALADDR = NO
 
 [dht]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [nse]
 START_ON_DEMAND = YES
@@ -118,40 +118,40 @@ START_ON_DEMAND = NO
 [sensor]
 START_ON_DEMAND = NO
 # Configuration file that can be included to prevent ANY of the usual
-# FORCESTART = YES to be set.  Also disables NSE POW calculation.
+# IMMEDIATE_START = YES to be set.  Also disables NSE POW calculation.
 #
 # This configuration is included from various configuration test files.
-# Whenever a new service is added that has FORCESTART = YES for
+# Whenever a new service is added that has IMMEDIATE_START = YES for
 # production should be disabled for (most) test suites, the option should
 # be added here instead of all over the place ;-).
 
 [core]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [dht]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [cadet]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [nse]
-FORCESTART = NO
+IMMEDIATE_START = NO
 WORKBITS = 0
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [zonemaster]
-FORCESTART = NO
+IMMEDIATE_START = NO
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 7c483a449..92bcf776d 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,6 +1,6 @@
 [fs]
 START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
 RESPECT = $GNUNET_DATA_HOME/fs/credit/
 STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
@@ -61,7 +61,7 @@ MAX_CADET_CLIENTS = 128
 
 [gnunet-auto-share]
 BINARY = gnunet-auto-share
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 # Note: MUST specify path to auto-share directory and CAN specify other options
 # to gnunet-auto-share here!
diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index 01cac95b8..c99674798 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -11,7 +11,7 @@ QUOTA = 2 GB
 #PLUGIN = heap
 #
 [fs]
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [testbed]
 OVERLAY_TOPOLOGY = CLIQUE
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index addfbf14a..2e6a02b07 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,6 +1,6 @@
 [gns]
 START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-gns
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-gns.sock
diff --git a/src/hostlist/hostlist.conf b/src/hostlist/hostlist.conf
index 77cd29e73..59cc351cc 100644
--- a/src/hostlist/hostlist.conf
+++ b/src/hostlist/hostlist.conf
@@ -1,5 +1,5 @@
 [hostlist]
-FORCESTART = YES
+IMMEDIATE_START = YES
 NOARMBIND = YES
 BINARY = gnunet-daemon-hostlist
 
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
index f3346b9fc..00c57c1e5 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
@@ -34,11 +34,11 @@ HTTPPORT = 12980
 HOSTLISTFILE = hostlists_peer1.file
 OPTIONS = -b -p
 SERVERS = http://localhost:22981/
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [ats]
 PORT = 12971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 
 [topology]
-FORCESTART = YES
\ No newline at end of file
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
index 95fb7ea1b..6bcd63fe7 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
+++ b/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
@@ -34,11 +34,11 @@ HTTPPORT = 22981
 HOSTLISTFILE = hostlists_peer2.file
 OPTIONS = -b -p
 SERVERS = http://localhost:12980/
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [ats]
 PORT = 22971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index 11c846634..3bee3c0c7 100644
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -35,11 +35,11 @@ HOSTLISTFILE = hostlists_adv_peer.file
 OPTIONS = -p -a
 SERVERS = http://localhost:12981/
 EXTERNAL_DNS_NAME = localhost
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [ats]
 PORT = 22971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p2-service-core.sock
 
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index 76585dbbd..0dafe6302 100644
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -34,11 +34,11 @@ HTTPPORT = 12980
 HOSTLISTFILE = hostlists_learn_peer.file
 OPTIONS = -b -e
 SERVERS = http://localhost:12981/
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [ats]
 PORT = 12971
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-ats-p1-service-core.sock
 
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/hostlist/test_learning_learn_peer2.conf b/src/hostlist/test_learning_learn_peer2.conf
index 593744cdc..dc2956dcc 100644
--- a/src/hostlist/test_learning_learn_peer2.conf
+++ b/src/hostlist/test_learning_learn_peer2.conf
@@ -34,7 +34,7 @@ HTTPPORT = 32980
 HOSTLISTFILE = hostlists_learn_peer2.file
 OPTIONS = -b -e
 SERVERS = http://localhost:12981/
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 8114aeabd..3ccdc2946 100644
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [fs]
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [datastore]
 START_ON_DEMAND = YES
@@ -17,10 +17,10 @@ START_ON_DEMAND = YES
 START_ON_DEMAND = YES
 
 [hostlist]
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [peerinfo]
 USE_INCLUDED_HELLOS = NO
diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index c8c7b4300..b2f1a764b 100644
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -21,36 +21,36 @@ USE_INCLUDED_HELLOS = NO
 NO_IO = YES
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf
index 3535d8399..c1ce7c63f 100644
--- a/src/multicast/test_multicast_line.conf
+++ b/src/multicast/test_multicast_line.conf
@@ -25,38 +25,38 @@ NO_IO = YES
 ID_ANNOUNCE_TIME = 5 s
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [nse]
diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf
index f80e36679..516c0e302 100644
--- a/src/multicast/test_multicast_star.conf
+++ b/src/multicast/test_multicast_star.conf
@@ -25,38 +25,38 @@ NO_IO = YES
 ID_ANNOUNCE_TIME = 5 s
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [nse]
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index 7b234451c..f3bd90e42 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,6 +1,6 @@
 [nse]
 START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 @JAVAPORT@PORT = 2097
 HOSTNAME = localhost
 BINARY = gnunet-service-nse
diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index 816427bac..d2c97567d 100644
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -14,7 +14,7 @@ SETUP_TIMEOUT = 30m
 STATS_DIR= /home/totakura/nse/test/load
 
 [nse]
-FORCESTART = YES
+IMMEDIATE_START = YES
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index 4f55fe4a1..f702faae2 100644
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -12,7 +12,7 @@ OVERLAY_RANDOM_LINKS = 1000
 OPERATION_TIMEOUT = 45 s
 
 [nse]
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = NO
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf
index 8331c241c..22866acfa 100644
--- a/src/nse/test_nse.conf
+++ b/src/nse/test_nse.conf
@@ -3,7 +3,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-nse-multipeer/
 
 [nse]
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-FORCESTART = YES
+IMMEDIATE_START = YES
 PROOFFILE = $GNUNET_TEST_HOME/proof.nse
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 8b2ab9639..6ff031f0d 100644
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -16,13 +16,13 @@ ID_ANNOUNCE_TIME = 5 s
 ENABLE_UPNP = NO
 
 [psyc]
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = YES
 
 [multicast]
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = YES
 
 [psycstore]
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = YES
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 4fd4d8b8a..85dd08113 100644
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -11,7 +11,7 @@ START_SYSTEM_SERVICES = NO
 START_USER_SERVICES = NO
 
 [exit]
-FORCESTART = YES
+IMMEDIATE_START = YES
 IPV6ADDR = FC5A:04E1:C2BA::1
 IPV6PREFIX = 96
 IPV4ADDR = 169.254.86.1
@@ -25,19 +25,19 @@ EXIT_IFNAME = eth1
 
 [dns]
 DNS_EXIT = 8.8.8.8
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [identity]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [hostlist]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [zonemaster]
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 #[vpn]
 #PREFIX = valgrind
@@ -66,7 +66,7 @@ ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 
 # Delays starting of GNS, as we need to first
 # setup the identity subsystem properly.
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [namestore]
 START_ON_DEMAND = YES
diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index dfe553784..9bee93e02 100644
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -9,7 +9,7 @@ PORT = 0
 ALLOW_SHUTDOWN = YES
 
 [exit]
-FORCESTART = YES
+IMMEDIATE_START = YES
 EXIT_IPV4 = YES
 EXIT_IPV6 = YES
 IPV6ADDR = FC5A:04E1:C2BA::1
@@ -22,7 +22,7 @@ EXIT_IFNAME = eth1
 
 [hostlist]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [nse]
 WORKBITS = 1
diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in
index fe2318286..d7ad174c9 100644
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -1,6 +1,6 @@
 [revocation]
 START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 @JAVAPORT@PORT = 2112
 HOSTNAME = localhost
 BINARY = gnunet-service-revocation
diff --git a/src/revocation/test_revocation.conf b/src/revocation/test_revocation.conf
index 14ecf6064..3b04150c1 100644
--- a/src/revocation/test_revocation.conf
+++ b/src/revocation/test_revocation.conf
@@ -6,7 +6,7 @@ SERVICEHOME=$GNUNET_TMP/test-revocation-service
 
 [revocation]
 WORKBITS = 3
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [identity]
 # Directory where we store information about our egos
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index 3d856c693..77a0df2c5 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -5,7 +5,7 @@ UNIXPATH = $GNUNET_TMP/gnunet-service-rps.sock
 HOME = $SERVICEHOME
 # PORT = 2106
 #@UNIXONLY@ PORT = 2087
-FORCESTART = YES
+IMMEDIATE_START = YES
 START_ON_DEMAND = NO
 NOARMBIND = YES
 #OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log
@@ -80,44 +80,44 @@ DISABLE_TRY_CONNECT = YES
 #GLOBAL_POSTFIX=-l /tmp/rps_profiler_logs/other-[]-%Y-%m-%d.log
 
 #[statistics]
-#FORCESTART = NO
+#IMMEDIATE_START = NO
 #START_ON_DEMAND = NO
 
 [peerinfo]
 NO_IO = YES
 
 [hostlist]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [zonemaster]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namecache]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [namestore]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [topology]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [vpn]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [revocation]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [gns]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
 
 [fs]
-FORCESTART = NO
+IMMEDIATE_START = NO
 START_ON_DEMAND = NO
diff --git a/src/social/test_social.conf b/src/social/test_social.conf
index df9815fd2..bc487760f 100644
--- a/src/social/test_social.conf
+++ b/src/social/test_social.conf
@@ -4,7 +4,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/gnunet-test-social/
 
 [social]
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [transport]
 PLUGINS = tcp
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 846b894c7..ac0c9c400 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -13,11 +13,11 @@ PORT = 12366
 START_ON_DEMAND = NO
 PORT = 12114
 BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [fs]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [resolver]
 HOSTNAME = localhost
@@ -25,11 +25,11 @@ START_ON_DEMAND = NO
 
 [cadet]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [dht]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [dhtcache]
 QUOTA = 1 MB
@@ -41,7 +41,7 @@ ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
 PORT = 12365
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [ats]
 WAN_QUOTA_OUT = 3932160
@@ -50,7 +50,7 @@ WAN_QUOTA_IN = 3932160
 [core]
 PORT = 12092
 START_ON_DEMAND = YES
-FORCESTART = YES
+IMMEDIATE_START = YES
 USE_EPHEMERAL_KEYS = NO
 
 [transport-udp]
@@ -62,42 +62,42 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 
 [dns]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [nse]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [vpn]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [gns-helper-service-w32]
 START_ON_DEMAND = NO
 
 [consensus]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [gns]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [statistics]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [peerinfo]
 NO_IO = YES
 
 [set]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
 
 [revocation]
 START_ON_DEMAND = NO
-FORCESTART = NO
+IMMEDIATE_START = NO
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index d893ba143..381c1bd85 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -18,7 +18,7 @@ PLUGINS = udp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 # Transport requires resolver when connecting to a peer, so enable it
 [resolver]
@@ -30,7 +30,7 @@ WAN_QUOTA_IN = 3932160
 
 [core]
 USE_EPHEMERAL_KEYS = NO
-FORCESTART = YES
+IMMEDIATE_START = 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 b46716cde..1916cc59d 100644
--- a/src/testbed/test_testbed_underlay.conf.in
+++ b/src/testbed/test_testbed_underlay.conf.in
@@ -7,7 +7,7 @@ OPERATION_TIMEOUT = 5 s
 [testbed-underlay]
 START_ON_DEMAND = NO
 DBFILE = /will/be/overwritten/by/testcase
-FORCESTART = YES
+IMMEDIATE_START = YES
 
 [dv]
 START_ON_DEMAND = NO
diff --git a/src/topology/topology.conf b/src/topology/topology.conf
index 2baf7ad38..45d8dd0c7 100644
--- a/src/topology/topology.conf
+++ b/src/topology/topology.conf
@@ -1,5 +1,5 @@
 [topology]
-FORCESTART = YES
+IMMEDIATE_START = YES
 NOARMBIND = YES
 MINIMUM-FRIENDS = 0
 FRIENDS-ONLY = NO
diff --git a/src/zonemaster/zonemaster.conf.in b/src/zonemaster/zonemaster.conf.in
index 057e43f29..58cfcb7ce 100644
--- a/src/zonemaster/zonemaster.conf.in
+++ b/src/zonemaster/zonemaster.conf.in
@@ -1,6 +1,6 @@
 [zonemaster]
 START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-zonemaster
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster.sock
@@ -28,7 +28,7 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
 
 [zonemaster-monitor]
 START_ON_DEMAND = @START_ON_DEMAND@
-FORCESTART = YES
+IMMEDIATE_START = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-zonemaster-monitor
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-zonemaster-monitor.sock