AUTOSTART renamed into START_ON_DEMAND (#4547a)

diff --git a/configure.ac b/configure.ac
index d031b9998a9d030cad203912796be07a68b15569..39b78fd3ebb14052f924b814dd0b7878b0cee44d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1377,24 +1377,25 @@ AM_CONDITIONAL([ENABLE_MALICIOUS], [test 1=$malicious])
 AC_DEFINE_UNQUOTED([ENABLE_MALICIOUS], [$malicious],
                    [enable compilation of malicious code])
 
-# should services be started by default when a peer starts?  Some services may
-# choose to never start by default and it is upto the service/module developer to
-# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART@" in
-# the service/module's conf.in file.
-AUTOSTART="YES"
-AC_MSG_CHECKING(whether to auto-start peer's services by default)
+# should services be started on demand when needed?  Some services may choose to
+# never start by default and it is up to the service/module developer to decide
+# by having "START_ON_DEMAND = NO" instead of "START_ON_DEMAND = @START_ON_DEMAND@"
+# in the service/module's conf.in file.
+# See also FORCESTART for an unconditional immediate start.
+START_ON_DEMAND="YES"
+AC_MSG_CHECKING(whether to start peer's services on demand by default)
 AC_ARG_ENABLE([autostart],
    [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])],
    [enable_autostart=${enableval}
     if test "x$enable_autostart" == "xno"
     then
-        AUTOSTART="NO"
+        START_ON_DEMAND="NO"
     fi
    ],
    [enable_autostart=yes])
 AC_MSG_RESULT($enable_autostart)
-#AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"])
-AC_SUBST(AUTOSTART)
+#AM_CONDITIONAL([HAVE_START_ON_DEMAND], [test "x$enable_autostart" = "xyes"])
+AC_SUBST(START_ON_DEMAND)
 
 # should memory statistics be kept (very expensive CPU-wise!)
 AC_MSG_CHECKING(whether to create expensive statistics on memory use)

diff --git a/contrib/conf/gnunet/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf
index 7bcf6c8ae12b618f84f4b3ee88d7f153a0a93c6b..114ec83a324009e19c34ccb4473077f3bc4daa9c 100644 (file)
--- a/contrib/conf/gnunet/no_autostart_above_core.conf
+++ b/contrib/conf/gnunet/no_autostart_above_core.conf
@@ -3,88 +3,88 @@
 # (including resolver)
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [datastore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [identity]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [conversation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [psycstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [regex]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [scalarproduct-bob]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [scalarproduct-alice]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [social]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [psyc]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [rps]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [multicast]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [sensordashboard]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [sensor]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [zonemaster-monitor]
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/contrib/nse/experiments/infiniband.conf b/contrib/nse/experiments/infiniband.conf
index c7b7f2a591b74cf2fb74bf06868545f6e89a3fcb..907c1a35e85bfdc869d3038e117b7925eef66158 100644 (file)
--- a/contrib/nse/experiments/infiniband.conf
+++ b/contrib/nse/experiments/infiniband.conf
@@ -2,7 +2,7 @@
 SERVICEHOME = $GNUNET_TMP/nse-profiler/
 
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;192.168.0.0/16;
 HOSTNAME = localhost
@@ -17,7 +17,7 @@ UNIXPATH = $GNUNET_TMP/test-nse-service-nse.unix
 BINARY = gnunet-service-nse
 #BINARY = /home/mrwiggles/documents/research/gnunet/gnunet-ng/src/nse/.libs/gnunet-service-nse
 #PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
-AUTOSTART = NO
+START_ON_DEMAND = NO
 # Overriding network settings for faster testing (do NOT use
 # these values in production just because they are here)
 WORKDELAY = 60 s
@@ -29,17 +29,17 @@ PROOFFILE = $SERVICEHOME/nse.proof
 UNIXPATH = $GNUNET_TMP/test-nse-service-arm.unix
 
 [statistics]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 12115
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [datastore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 DISABLEV6 = YES
@@ -57,34 +57,34 @@ plugins = udp
 PORT = 12116
 
 [core]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [peerinfo]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [topology]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [chat]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse-profiler]
 OUTPUT_FILE = nse_output_2000_peers.dat

diff --git a/contrib/testbed_configs/regex_profiler_infiniband.conf b/contrib/testbed_configs/regex_profiler_infiniband.conf
index 831ee0f769a95cec4c4c85d28281b89faa9c8a4f..2a748ac51ef2d393f0508e4f3756caa3943caf69 100644 (file)
--- a/contrib/testbed_configs/regex_profiler_infiniband.conf
+++ b/contrib/testbed_configs/regex_profiler_infiniband.conf
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 11999
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
@@ -13,7 +13,7 @@ BINARY = /home/szengel/gnunet/src/cadet/.libs/gnunet-daemon-regexprofiler
 REGEX_PREFIX = "GNVPN-0001-PAD"
 
 [cadet]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 APP_ANNOUNCE_TIME = 240 s
 ID_ANNOUNCE_TIME = 120 m
@@ -22,7 +22,7 @@ PORT = 12001
 DHT_REPLICATION_LEVEL = 3
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
 # Do not allow DHT to create extra connections, beyond those testbed created
@@ -41,14 +41,14 @@ DISABLE_BF = YES
 IN_MEMORY = YES
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 HOSTNAME = localhost
 
 [transport]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PLUGINS = tcp
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 ACCEPT_FROM6 = ::1;
@@ -60,7 +60,7 @@ WAN_QUOTA_OUT = 3932160
 WAN_QUOTA_IN = 3932160
 
 [core]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport-tcp]
 TIMEOUT = 300 s
@@ -74,7 +74,7 @@ ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 
 [statistics]
 PORT = 12008
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 DISABLE = NO
 
@@ -89,15 +89,15 @@ PEERGROUP_TIMEOUT = 2400 s
 SERVICEHOME = $GNUNET_TMP/perf-regex/
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 # Minimize proof-of-work CPU consumption by NSE
 WORKBITS = 1
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 # Allow running on systems with only loopback?

diff --git a/contrib/testbed_configs/testbed_cluster.conf b/contrib/testbed_configs/testbed_cluster.conf
index f92e4d7214c1ca7e71e838cdc8187cc518b53657..62c83ec78ced2ee3130a777685ae128d0d2eba69 100644 (file)
--- a/contrib/testbed_configs/testbed_cluster.conf
+++ b/contrib/testbed_configs/testbed_cluster.conf
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; 10.0.0.0/8;
 HOSTNAME = localhost
@@ -11,22 +11,22 @@ SETUP_TIMEOUT = 30m
 MAX_OPEN_FDS = 512
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 71
 
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 70
 DISABLE_TRY_CONNECT = YES
 
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 72
 
 [dhtcache]
@@ -42,7 +42,7 @@ NEIGHBOUR_LIMIT = 10
 
 [core]
 PORT = 12092
-AUTOSTART = YES
+START_ON_DEMAND = YES
 USE_EPHEMERAL_KEYS = NO
 
 [arm]
@@ -58,28 +58,28 @@ BROADCAST = NO
 SERVICEHOME = $GNUNET_TMP/test-testbed/
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 NO_IO = YES
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [lockmanager]
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/contrib/testbed_configs/testbed_infiniband.conf b/contrib/testbed_configs/testbed_infiniband.conf
index c87f56eef1b646b7ff2b309a5568672a09df13a3..812945eea58b4b0d4d61474c71faece004193588 100644 (file)
--- a/contrib/testbed_configs/testbed_infiniband.conf
+++ b/contrib/testbed_configs/testbed_infiniband.conf
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
@@ -11,22 +11,22 @@ SETUP_TIMEOUT = 30m
 MAX_OPEN_FDS = 512
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 71
 
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 70
 DISABLE_TRY_CONNECT = YES
 
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 72
 
 [dhtcache]
@@ -42,7 +42,7 @@ NEIGHBOUR_LIMIT = 10
 
 [core]
 PORT = 12092
-AUTOSTART = YES
+START_ON_DEMAND = YES
 USE_EPHEMERAL_KEYS = NO
 
 [arm]
@@ -58,28 +58,28 @@ BROADCAST = NO
 SERVICEHOME = $GNUNET_TMP/test-testbed/
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 RETURN_LOCAL_ADDRESSES = YES
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 NO_IO = YES
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [lockmanager]
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/contrib/testbed_configs/testbed_supermuc.conf b/contrib/testbed_configs/testbed_supermuc.conf
index 4603b1fe333c6df19c6799038c82a496e64d6e12..47bfee43cf0048d1c57a7c75d9ec59d678ac29aa 100644 (file)
--- a/contrib/testbed_configs/testbed_supermuc.conf
+++ b/contrib/testbed_configs/testbed_supermuc.conf
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;10.0.0.0/8;
 HOSTNAME = localhost
@@ -14,22 +14,22 @@ MAX_OPEN_FDS=512
 SETUP_TIMEOUT = 30 m
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 71
 
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 70
 DISABLE_TRY_CONNECT = YES
 
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 72
 
 [dhtcache]
@@ -45,7 +45,7 @@ NEIGHBOUR_LIMIT = 10
 
 [core]
 PORT = 12092
-AUTOSTART = YES
+START_ON_DEMAND = YES
 USE_EPHEMERAL_KEYS = NO
 
 [arm]
@@ -66,7 +66,7 @@ BEHIND_NAT = NO
 RETURN_LOCAL_ADDRESSES = NO
 
 [peerinfo]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NO_IO = YES
 
 [testing]

diff --git a/doc/documentation/chapters/developer.texi b/doc/documentation/chapters/developer.texi
index 6d85c813f8441cfdbb23a2903a6e7ac7f2c2afe6..f4c95450935efdde1d9115113f21c9e41d354883 100644 (file)
--- a/doc/documentation/chapters/developer.texi
+++ b/doc/documentation/chapters/developer.texi
@@ -3702,7 +3702,7 @@ running a service with "valgrind" or "gdb"
 
 @item DEBUG Run in debug mode (much verbosity).
 
-@item AUTOSTART ARM will listen to UNIX domain socket and/or TCP port of
+@item START_ON_DEMAND ARM will listen to UNIX domain socket and/or TCP port of
 the service and start the service on-demand.
 
 @item FORCESTART ARM will always start this service when the peer
@@ -3716,7 +3716,7 @@ is started.
 
 
 Options that impact the operation of ARM overall are in the "[arm]"
-section. ARM is a normal service and has (except for AUTOSTART) all of the
+section. ARM is a normal service and has (except for START_ON_DEMAND) all of the
 options that other services do. In addition, ARM has the
 following options:
 
@@ -8642,11 +8642,11 @@ In the following paragraph the important details are highlighted.
 
 Announcing of the regular expressions is done by the
 gnunet-daemon-regexprofiler, therefore you have to make sure it is
-started, by adding it to the AUTOSTART set of ARM:
+started, by adding it to the START_ON_DEMAND set of ARM:
 
 @example
 [regexprofiler]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 @end example
 
 @noindent

diff --git a/doc/documentation/chapters/user.texi b/doc/documentation/chapters/user.texi
index fa742b229c2a48ac364a5f73b271d822735c2788..3b829559b8ac22490529186d0ce537f06052bd38 100644 (file)
--- a/doc/documentation/chapters/user.texi
+++ b/doc/documentation/chapters/user.texi
@@ -2574,7 +2574,7 @@ sqLite, MySQL and Postgres.
 
 In order to use GNUnet for file-sharing, you first need to make sure
 that the file-sharing service is loaded.
-This is done by setting the @code{AUTOSTART} option in
+This is done by setting the @code{START_ON_DEMAND} option in
 section @code{[fs]} to "YES". Alternatively, you can run
 
 @example
@@ -2666,7 +2666,7 @@ The configuration section for the transport service itself is quite
 similar to all the other services
 
 @example
-AUTOSTART = YES
+START_ON_DEMAND = YES
 @@UNIXONLY@@ PORT = 2091
 HOSTNAME = localhost
 HOME = $SERVICEHOME

diff --git a/doc/man/gnunet.conf.5 b/doc/man/gnunet.conf.5
index 1a94a0a6693c784e67c573c804000edf6e2f9dbf..b0f1c152c3a95a7d139cbd556ba581fa2e749df9 100644 (file)
--- a/doc/man/gnunet.conf.5
+++ b/doc/man/gnunet.conf.5
@@ -59,7 +59,7 @@ The following options are generic and shared by all services:
     Start the service always when the peer starts.  Set to YES for services
     that should always be launched, even if no other service explicitly needs
     them.
-.IP AUTOSTART
+.IP START_ON_DEMAND
     Set to YES to automatically start the service when it is requested by
     another service. YES for most GNUnet services.
 .IP NOARMBIND

diff --git a/po/vi.po b/po/vi.po
index 9a58b61932ef1c76424fb0aacce61d5d990e4bce..da28c66b49167147273a8af834975917a2d3ccbb 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -11431,9 +11431,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Unable to create user account for daemon."
 #~ msgstr "Không thể tạo tài khoản người dùng cho trình nền."
 
-#~ msgid "Unable to setup autostart for daemon."
-#~ msgstr "Không thể thiết lập chức năng tự động khởi chạy cho trình nền."
-
 #~ msgid "Save configuration?"
 #~ msgstr "Lưu cấu hình không?"
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9223350db5f0865af095e13b7b778aeea801b8cd..80d7e19961acf806efc6198edec29a5ce5583d16 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10275,9 +10275,6 @@ msgstr ""
 #~ "如果您回答“是”，GNUnet 后台进程将在开机时自动启动。如果您回答“否”，则需要"
 #~ "在每次使用 GNUnet 时自己启动它。"
 
-#~ msgid "Unable to setup autostart for daemon."
-#~ msgstr "无法将守护进程设置为自动启动。"
-
 #~ msgid "Save configuration?"
 #~ msgstr "保存配置？"
 

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index f7a59c5fb9fe0b084b655f20093997e5aa85f6d7..a6dccf3de83dee01af2c7520969c36fa5da5aa36 100644 (file)
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -510,7 +510,7 @@ get_server_addresses (const char *service_name,
     if (GNUNET_YES ==
        GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                              service_name,
-                                             "AUTOSTART"))
+                                             "START_ON_DEMAND"))
       LOG (GNUNET_ERROR_TYPE_ERROR,
           _("Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
           service_name);
@@ -2076,7 +2076,7 @@ setup_service (void *cls,
     if (GNUNET_YES !=
         GNUNET_CONFIGURATION_get_value_yesno (cfg,
                                               section,
-                                              "AUTOSTART"))
+                                              "START_ON_DEMAND"))
       return;
   }
   if (0 >= (ret = get_server_addresses (section,

diff --git a/src/arm/test_arm_api_data.conf b/src/arm/test_arm_api_data.conf
index b032cc95ad0446bd81dd5199074c9bdcb2132d63..276b313b7c0862ec1c9ff7277734245af29ed002 100644 (file)
--- a/src/arm/test_arm_api_data.conf
+++ b/src/arm/test_arm_api_data.conf
@@ -10,12 +10,12 @@ OPTIONS = -L ERROR
 #PREFIX = valgrind --tool=memcheck --leak-check=yes
 
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 23355
 # PREFIX = valgrind
 
 [do-nothing]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 2223
 HOSTNAME = localhost
 BINARY = /will/be/overwritten/by/test_exponential_backoff
@@ -23,16 +23,16 @@ ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
 
 [statistics]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [core]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [transport]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [ats]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index d9e867bde75069b72b82a5a6fb4bbd0ca577f32a..53c0de0c5ca598a84f963a8ad3c96f5516ed7fe2 100644 (file)
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -1,5 +1,5 @@
 [ats]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2098
 HOSTNAME = localhost
 BINARY = gnunet-service-ats

diff --git a/src/auction/auction.conf b/src/auction/auction.conf
index 6ca35896bc5810a9216d01277c90150cec07e9f9..deb9ac1fc91c437ea0f0190b7f03d6d2d643fd5c 100644 (file)
--- a/src/auction/auction.conf
+++ b/src/auction/auction.conf
@@ -1,4 +1,4 @@
 [auction]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 BINARY = gnunet-service-auction
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-auction.sock

diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index d50e168f0938b8f3bd7a8699cdd34ed3fc2e4a08..8e4a8b1cf9dc1d5c653b8e8e6f27ee5fc9535b55 100644 (file)
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -1,6 +1,6 @@
 [cadet]
 FORCESTART = YES
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2096
 HOSTNAME = localhost
 BINARY = gnunet-service-cadet

diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index f2308df29ff893c7c2b74b6fbd98748a5b4ad947..4731617d4e53da7707f30b0598e190d5acdaa0e1 100644 (file)
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -69,32 +69,32 @@ WORKBITS = 0
 
 [hostlist]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [fs]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [topology]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in
index 2afee04dbad2e10a77ded5b16cdc492766236d5f..b0fbcaf5af9f253895f1de186355a1595350b066 100644 (file)
--- a/src/consensus/consensus.conf.in
+++ b/src/consensus/consensus.conf.in
@@ -1,5 +1,5 @@
 [consensus]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2103
 HOSTNAME = localhost
 BINARY = gnunet-service-consensus

diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 6cb0885b076e3d065d82210ce5d86a6234281f1d..42e06a66d562ffc341991a2c3893fac955a6f10c 100644 (file)
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -54,13 +54,13 @@ OPERATION_TIMEOUT = 60 s
 MAX_OPEN_FDS = 4096
 
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 # Use addresses from the local network interfaces (inluding loopback, but also others)

diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in
index e966ed6d9f87e389332ea0800b07b953d63cef2b..b28fb6e1f2149a34ba3d7808a33d0804c6228b8a 100644 (file)
--- a/src/conversation/conversation.conf.in
+++ b/src/conversation/conversation.conf.in
@@ -1,5 +1,5 @@
 [conversation]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-conversation
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock
 HOSTNAME = localhost

diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index 3f388632e80974c8480747830d5f3a377f9c9086..2b20a109a17bf345335aad42b4705f50a6452bea 100644 (file)
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -1,5 +1,5 @@
 [core]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2092
 HOSTNAME = localhost
 BINARY = gnunet-service-core

diff --git a/src/credential/test_credential_lookup.conf b/src/credential/test_credential_lookup.conf
index bd464a1f4237d064a42ce7155f70dd11a1b0d0d9..39f68c9443bb918cc559679feb0b7ae4afee538e 100644 (file)
--- a/src/credential/test_credential_lookup.conf
+++ b/src/credential/test_credential_lookup.conf
@@ -4,13 +4,13 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-credential-peer-1/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 PLUGINS =
 
 [credential]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/credlog
 
 [rest]
@@ -18,7 +18,7 @@ PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/r
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s

diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 721c865c82093929ca21f2e78e1acab22ba069a1..21d24bb52092079cd3934870d8378233d7110427 100644 (file)
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -1,5 +1,5 @@
 [datastore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES

diff --git a/src/datastore/test_defaults.conf b/src/datastore/test_defaults.conf
index 08e630eb0bc7ec188f28cc3d116c1134f444e68a..1f971de8fd06c99a0e3914556a0d3ef65215358a 100644 (file)
--- a/src/datastore/test_defaults.conf
+++ b/src/datastore/test_defaults.conf
@@ -4,7 +4,7 @@
 [datastore]
 PORT = 22654
 QUOTA = 1 MB
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [nse]
 WORKBITS = 1

diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index f828b725f9a5766145d12acbfa60e313eac7fdb1..9ae6d630b5bcbc6bda19f398ca66bfb48f062a7f 100644 (file)
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,6 +1,6 @@
 [dht]
 FORCESTART = YES
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2095
 HOSTNAME = localhost
 BINARY = gnunet-service-dht

diff --git a/src/dht/test_dht_2dtorus.conf b/src/dht/test_dht_2dtorus.conf
index a541e8443990b39db7e00796c2723c116809b326..c3621cda5b57a5778b6008f85cc28be2c05e831d 100644 (file)
--- a/src/dht/test_dht_2dtorus.conf
+++ b/src/dht/test_dht_2dtorus.conf
@@ -4,7 +4,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_2dtorus/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [dhtcache]
@@ -28,7 +28,7 @@ WAN_QUOTA_OUT = 1 GB
 OVERLAY_TOPOLOGY = 2D_TORUS
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0

diff --git a/src/dht/test_dht_api_data.conf b/src/dht/test_dht_api_data.conf
index a2c1829c691659323a8e1ae3e1ed1b061285934b..3a9857cff2caeefef16ae9a2e7e627a014dfc9ec 100644 (file)
--- a/src/dht/test_dht_api_data.conf
+++ b/src/dht/test_dht_api_data.conf
@@ -36,9 +36,9 @@ INTERNAL_ADDRESS = 127.0.0.1
 EXTERNAL_ADDRESS = 127.0.0.1
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1

diff --git a/src/dht/test_dht_api_peer1.conf b/src/dht/test_dht_api_peer1.conf
index b4164077f23b2eea69153c6a39c33544ab6ce287..64dc243e0ec6d009a0334a69ff40e1f56472f7fa 100644 (file)
--- a/src/dht/test_dht_api_peer1.conf
+++ b/src/dht/test_dht_api_peer1.conf
@@ -33,9 +33,9 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1

diff --git a/src/dht/test_dht_line.conf b/src/dht/test_dht_line.conf
index 5368b0bafb5ed60c42d1efc91405b0b88c5f414d..8e48b1165e323ba16e73d68884bd6c319ada5d0a 100644 (file)
--- a/src/dht/test_dht_line.conf
+++ b/src/dht/test_dht_line.conf
@@ -4,7 +4,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test_dht_line/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [dhtcache]
@@ -32,7 +32,7 @@ OVERLAY_TOPOLOGY = LINE
 plugins = unix
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0

diff --git a/src/dht/test_dht_monitor.conf b/src/dht/test_dht_monitor.conf
index c0d457e89dfcbc3c7254d6d3782ef22cc767af86..26052555e82facc7f2e03df7386d1cfc9bde3a2d 100644 (file)
--- a/src/dht/test_dht_monitor.conf
+++ b/src/dht/test_dht_monitor.conf
@@ -31,9 +31,9 @@ RETURN_LOCAL_ADDRESSES = YES
 
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1

diff --git a/src/dht/test_dht_multipeer.conf b/src/dht/test_dht_multipeer.conf
index 4296d783e36eea13e9308dc632509d3f5d39404c..72537390041ed2b2c63e7e9c86b2f3b98eed3350 100644 (file)
--- a/src/dht/test_dht_multipeer.conf
+++ b/src/dht/test_dht_multipeer.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [dhtcache]
@@ -34,7 +34,7 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = YES
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKDELAY = 500 ms
 INTERVAL = 60 s
 WORKBITS = 0

diff --git a/src/dht/test_dht_tools.conf b/src/dht/test_dht_tools.conf
index 46d206448dc2f7f2f46aca27582dda8fc1033f23..f13c9a66a236a69d1ec1836672ae5a349d3db434 100644 (file)
--- a/src/dht/test_dht_tools.conf
+++ b/src/dht/test_dht_tools.conf
@@ -30,93 +30,93 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 WORKBITS = 1
 # Configuration to disable autostarting of
 # all services above the 'core' level.
 # (including resolver)
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [datastore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [identity]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [conversation]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [psycstore]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [regex]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [scalarproduct-bob]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [scalarproduct-alice]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [social]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [psyc]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [rps]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [multicast]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [sensordashboard]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [sensor]
-AUTOSTART = NO
+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.
 #
@@ -154,4 +154,4 @@ FORCESTART = NO
 FORCESTART = NO
 
 [zonemaster]
-FORCESTART = NO
\ No newline at end of file
+FORCESTART = NO

diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index 000b73cf1ca1e5c37ae7aca7f4cc6872b6d5ce1b..39f260813b21730b69c944c52068eb6e16f296db 100644 (file)
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -1,5 +1,5 @@
 [dns]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 HOSTNAME = localhost
 BINARY = gnunet-service-dns
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock

diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in
index 5d9a960f5774a9bd01be5fdd808e7e2f326c160b..145c58be64070d7f72aaa43b0108cc39db21eb75 100644 (file)
--- a/src/dv/dv.conf.in
+++ b/src/dv/dv.conf.in
@@ -1,5 +1,5 @@
 [dv]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 BINARY = gnunet-service-dv

diff --git a/src/dv/test_transport_dv_data.conf b/src/dv/test_transport_dv_data.conf
index ff02d4a5e494ca969471f17243608ee051ea04c7..307921ac4daf081c5becd69a4e57e954348b894a 100644 (file)
--- a/src/dv/test_transport_dv_data.conf
+++ b/src/dv/test_transport_dv_data.conf
@@ -6,11 +6,11 @@ PLUGINS = tcp dv
 #PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 
 [dv]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 
 [set]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 # PREFIX = valgrind --leak-check=full --track-fds=yes --leak-resolution=high
 
 [core]

diff --git a/src/fragmentation/test_fragmentation_data.conf b/src/fragmentation/test_fragmentation_data.conf
index c236f689ce0ea0f7594197314701bafcd77e6c66..54ad21ff908c002ac88790c0906c796f5a6f66e0 100644 (file)
--- a/src/fragmentation/test_fragmentation_data.conf
+++ b/src/fragmentation/test_fragmentation_data.conf
@@ -1,5 +1,5 @@
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 

diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index d46de387f27389716894ec5b1b000d1dfd57bb94..7c483a44988f6357244f1db5db0e58f7e5a2b4d0 100644 (file)
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,5 +1,5 @@
 [fs]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 FORCESTART = YES
 INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
 RESPECT = $GNUNET_DATA_HOME/fs/credit/

diff --git a/src/gns/gns-helper-service-w32.conf b/src/gns/gns-helper-service-w32.conf
index 48652173a3f2814c99cfe731dbc3ed8082ba35f5..a7b9fdd70489a95096267c964893626ab0863ba8 100644 (file)
--- a/src/gns/gns-helper-service-w32.conf
+++ b/src/gns/gns-helper-service-w32.conf
@@ -1,4 +1,4 @@
 [gns-helper-service-w32]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-gns-helper-service-w32
 PORT = 5353

diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index 323129a1e652c1435468d1e30a7cb8e20a70e39c..addfbf14a38818cf27637ce64234a903021ce1d1 100644 (file)
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,5 +1,5 @@
 [gns]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 FORCESTART = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-gns
@@ -30,7 +30,7 @@ INTERCEPT_DNS = NO
 
 [gns-proxy]
 BINARY = gnunet-gns-proxy
-AUTOSTART = NO
+START_ON_DEMAND = NO
 RUN_PER_USER = YES
 
 # Where is the certificate for the GNS proxy stored?
@@ -40,7 +40,7 @@ PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 
 [dns2gns]
 BINARY = gnunet-dns2gns
-AUTOSTART = NO
+START_ON_DEMAND = NO
 RUN_PER_USER = YES
 
 # -d: DNS resolver to use, -s: suffix to use, -f: fcfs suffix to use

diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index a7b84230219cb6f99e1048e5f6d052069755d9e5..0d9d2b49abaed3c6022e242eaf6338966c377419 100644 (file)
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -4,14 +4,14 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 PLUGINS =
 
 [gns]
 # PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s

diff --git a/src/gns/test_gns_nick_shorten.conf b/src/gns/test_gns_nick_shorten.conf
index 210159fc8e0b3ae8a42628d6cc867fad5bec607e..317477c805b880508146d2bb688b6521e1af1320 100644 (file)
--- a/src/gns/test_gns_nick_shorten.conf
+++ b/src/gns/test_gns_nick_shorten.conf
@@ -4,14 +4,14 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-gns-peer-1/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 PLUGINS =
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s

diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 875c0a5e3dd356649eaa225766ff4dff1ce8f066..51edd5a0c53815bb013a4c36bb9372e06fbf0439 100644 (file)
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -13,7 +13,7 @@ WEAKRANDOM = YES
 HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
 
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 HIJACK_DNS = YES
 
@@ -22,7 +22,7 @@ PROXY_CACERT = proxy/test_cert.pem
 PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
 
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dns]
 PROVIDE_EXIT = NO

diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf
index 5bf6f8e63fdd56e5913b8ec21750551709704af8..3747313770db0ee512c305529680f344c6168856 100644 (file)
--- a/src/gns/test_gns_simple_lookup.conf
+++ b/src/gns/test_gns_simple_lookup.conf
@@ -1,13 +1,13 @@
 @INLINE@ test_gns_defaults.conf
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 HOSTNAME = localhost
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -54,12 +54,12 @@ EXTERNAL_ADDRESS = 127.0.0.1
 USE_LOCALADDR = NO
 
 [dns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 DNS_EXIT = 8.8.8.8
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-service-gns
 ZONEKEY = zonefiles/test_zonekey
 PRIVATE_ZONE = private
@@ -75,14 +75,14 @@ DEFAULT_LOOKUP_TIMEOUT = 15 s
 RECORD_PUT_INTERVAL = 1 h
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 PORT = 22371
-AUTOSTART = YES
+START_ON_DEMAND = YES
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore-default.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES

diff --git a/src/identity-provider/identity-provider.conf b/src/identity-provider/identity-provider.conf
index 3d4e340a66b164c03c6a0d396933e130d5f294a3..cc50152a1e48ec255542b4ffd94eb2ebadb1132c 100644 (file)
--- a/src/identity-provider/identity-provider.conf
+++ b/src/identity-provider/identity-provider.conf
@@ -1,5 +1,5 @@
 [identity-provider]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 RUN_PER_USER = YES
 #PORT = 2108
 HOSTNAME = localhost

diff --git a/src/identity-provider/test_idp.conf b/src/identity-provider/test_idp.conf
index 3559dd7679d2c0af5ad83067914c7124d05f0f69..3e4df561a2305ed71cae227ce08ebe6638029d49 100644 (file)
--- a/src/identity-provider/test_idp.conf
+++ b/src/identity-provider/test_idp.conf
@@ -4,22 +4,22 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-idp-peer-1/
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [rest]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=$GNUNET_TMP/restlog
 
 [transport]
 PLUGINS =
 
 [identity-provider]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes --log-file=$GNUNET_TMP/idplog
 
 [gns]
 #PREFIX = valgrind --leak-check=full --track-origins=yes
-AUTOSTART = YES
+START_ON_DEMAND = YES
 AUTO_IMPORT_PKEY = YES
 MAX_PARALLEL_BACKGROUND_QUERIES = 10
 DEFAULT_LOOKUP_TIMEOUT = 15 s

diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 32855c02d37448173795e007c26bd35b5a8dacf4..f5d454323093aa90a908f4b20bcf30368ac8b5da 100644 (file)
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,5 +1,5 @@
 [identity]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 RUN_PER_USER = YES
 @JAVAPORT@PORT = 2108
 HOSTNAME = localhost

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 26e816267b60bfebaf32c7c6fb97519a50bcea8c..38a7d7fbc456c6bda5ead7c2e0d8314c11ae3adc 100644 (file)
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -32,13 +32,13 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 
 [consensus]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [core]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17

diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index 0cd6fc4f9800e708b931ef16cac354aa713a9ced..6c8f07632d9d7bfb30103e523a39246ca7e5854f 100644 (file)
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -33,16 +33,16 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
 
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dns]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
 
 [consensus]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [lockmanager]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [core]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17

diff --git a/src/integration-tests/confs/test_defaults.conf b/src/integration-tests/confs/test_defaults.conf
index 39020515f64e71fb0ace1bbd6cafa976e323a741..8114aeabd24b560c964edb283d8cee52d7ced4d7 100644 (file)
--- a/src/integration-tests/confs/test_defaults.conf
+++ b/src/integration-tests/confs/test_defaults.conf
@@ -5,16 +5,16 @@
 FORCESTART = YES
 
 [datastore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [nse]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [cadet]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [hostlist]
 FORCESTART = YES

diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in
index f4a6daa1e69303d00006257c5964e623e0984f45..97a5413363a049e53dc5e4141bd86713d134353b 100644 (file)
--- a/src/multicast/multicast.conf.in
+++ b/src/multicast/multicast.conf.in
@@ -1,5 +1,5 @@
 [multicast]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-multicast
 
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock

diff --git a/src/multicast/test_multicast.conf b/src/multicast/test_multicast.conf
index 1b50e0893f5bfb460c989dc779f28bd38734428a..c8c7b4300ce87ebda347c0e49d93ed4efcb4042c 100644 (file)
--- a/src/multicast/test_multicast.conf
+++ b/src/multicast/test_multicast.conf
@@ -10,7 +10,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -22,35 +22,35 @@ NO_IO = YES
 
 [hostlist]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [topology]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/src/multicast/test_multicast_line.conf b/src/multicast/test_multicast_line.conf
index 1047205cbf58015516b6eec8b034576ede56c426..3535d83991959191d4546b9f283094664081d636 100644 (file)
--- a/src/multicast/test_multicast_line.conf
+++ b/src/multicast/test_multicast_line.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -26,38 +26,38 @@ ID_ANNOUNCE_TIME = 5 s
 
 [hostlist]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [topology]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse]
 WORKBITS = 0

diff --git a/src/multicast/test_multicast_star.conf b/src/multicast/test_multicast_star.conf
index ed690d95d2ce5947587c427abd9723e8633646f2..f80e36679bf08f77d703ad5e23f6f6c9def9b858 100644 (file)
--- a/src/multicast/test_multicast_star.conf
+++ b/src/multicast/test_multicast_star.conf
@@ -11,7 +11,7 @@ GLOBAL_POSTFIX=-L ERROR
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-multicast.sock
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [peerinfo]
 # Do not use shipped gnunet HELLOs 
@@ -26,38 +26,38 @@ ID_ANNOUNCE_TIME = 5 s
 
 [hostlist]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 ENABLE_UPNP = NO
 
 [fs]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [topology]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nse]
 WORKBITS = 0

diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in
index 27062ca82de5bcb226a20e7c6eb2c5df2ca7533e..cf134084676adbd75628b892a7ddb85460b4115b 100644 (file)
--- a/src/namecache/namecache.conf.in
+++ b/src/namecache/namecache.conf.in
@@ -1,5 +1,5 @@
 [namecache]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 RUN_PER_USER = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
 UNIX_MATCH_UID = NO

diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 94e1586098f62314fc048a71c2f4e599194063df..eb95f95bebf6f59bb6ac0a920210d3b436869347 100644 (file)
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,5 +1,5 @@
 [namestore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 RUN_PER_USER = YES
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-namestore.sock
 UNIX_MATCH_UID = NO
@@ -42,7 +42,7 @@ gns = gnunet-namestore
 [fcfsd]
 # Name of the fcfs registration service binary (for ARM)
 BINARY = gnunet-namestore-fcfsd
-AUTOSTART = NO
+START_ON_DEMAND = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-fcfsd.sock
 
 # On what port does the FCFS daemon listen for HTTP clients?

diff --git a/src/namestore/test_namestore_api.conf b/src/namestore/test_namestore_api.conf
index 5e96eab7c8c29a223223d9f2967fbcec0aecb2df..3e75c2dedd1fcaa267509c3fcbb1587a9637bb6e 100644 (file)
--- a/src/namestore/test_namestore_api.conf
+++ b/src/namestore/test_namestore_api.conf
@@ -6,14 +6,14 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-namestore/
 
 [namestore]
 DATABASE = sqlite
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [namecache]
 DATABASE = sqlite
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [identity]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [nse]
 WORKBITS = 0

diff --git a/src/nat-auto/nat-auto.conf.in b/src/nat-auto/nat-auto.conf.in
index 9461ffcc88c64c115da4e5313398f1ddfdc87203..d5f5c4eef0ba08aa730bedc9786d13d1fa032eec 100644 (file)
--- a/src/nat-auto/nat-auto.conf.in
+++ b/src/nat-auto/nat-auto.conf.in
@@ -1,5 +1,5 @@
 [nat-auto]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2124
 HOSTNAME = localhost
 BINARY = gnunet-service-nat-auto

diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in
index 87fe29d9cabf9b4edcd76974ecbab8daf5c73751..a8dbee953ff646ca26c91907e9a31d11e49fde14 100644 (file)
--- a/src/nat/nat.conf.in
+++ b/src/nat/nat.conf.in
@@ -1,5 +1,5 @@
 [nat]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2121
 HOSTNAME = localhost
 BINARY = gnunet-service-nat

diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index c0174bf536d0916c778c50edf9894a6eea7acf6a..84de6159e523f424fbb17145cdde06ead713b220 100644 (file)
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -42,6 +42,6 @@ DISABLEV6 = YES
 
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 

diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index e8d7bd2ea6e09ba5e947855996b5d11d22c10640..7b234451cd5d7a51c37ed14352f2cde574b2aac2 100644 (file)
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,5 +1,5 @@
 [nse]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 FORCESTART = YES
 @JAVAPORT@PORT = 2097
 HOSTNAME = localhost

diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index 9904ca7118068e53903aaa1d7d277a991d7b3c25..816427bac890f75e4beb55fdd9407564edd62406 100644 (file)
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
 
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 ORT = 12113
 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
 HOSTNAME = localhost

diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf
index ad5da536b9ce5e8c03bcfff22455fd3012837dbc..4f55fe4a172e242112696352f9878475186b69c6 100644 (file)
--- a/src/nse/nse_profiler_test.conf
+++ b/src/nse/nse_profiler_test.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/nse-profiler/
 
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16;
 HOSTNAME = localhost
@@ -13,7 +13,7 @@ OPERATION_TIMEOUT = 45 s
 
 [nse]
 FORCESTART = YES
-AUTOSTART = NO
+START_ON_DEMAND = NO
 # 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/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index 8615a8866223ea16eb4c25a9ad03bea72de02a46..14a41655be503ca4473af2d969b0b2392460274c 100644 (file)
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -1,5 +1,5 @@
 [peerinfo]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2090
 HOSTNAME = localhost
 BINARY = gnunet-service-peerinfo

diff --git a/src/peerinfo/test_peerinfo_api_data.conf b/src/peerinfo/test_peerinfo_api_data.conf
index 1522d4dfe42c7817c62ccc829da889dcb78e837f..e632c341f6a9e42c33b7412bf3cb23ad7ce0b6da 100644 (file)
--- a/src/peerinfo/test_peerinfo_api_data.conf
+++ b/src/peerinfo/test_peerinfo_api_data.conf
@@ -5,11 +5,11 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerinfo/
 PORT = 22354
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 

diff --git a/src/peerstore/peerstore.conf.in b/src/peerstore/peerstore.conf.in
index a39b61887aec27c9ffb067941fa4e5cb9da42490..a3a7c672bd970bd919d96cad6f92e748ace0f25f 100644 (file)
--- a/src/peerstore/peerstore.conf.in
+++ b/src/peerstore/peerstore.conf.in
@@ -1,5 +1,5 @@
 [peerstore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2110
 HOSTNAME = localhost
 BINARY = gnunet-service-peerstore

diff --git a/src/peerstore/test_peerstore_api_data.conf b/src/peerstore/test_peerstore_api_data.conf
index 802418fa056ed411ac451c6b77db23bd5b226179..3ebda50eb2d1464a0010c080b4369c8d6811c949 100644 (file)
--- a/src/peerstore/test_peerstore_api_data.conf
+++ b/src/peerstore/test_peerstore_api_data.conf
@@ -2,7 +2,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-peerstore
 
 [peerstore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 BINARY = gnunet-service-peerstore
 UNIXPATH = $GNUNET_TMP/gnunet-service-peerstore.sock
 HOME = $SERVICEHOME

diff --git a/src/psyc/psyc.conf.in b/src/psyc/psyc.conf.in
index 4a4a969542eeeeaeb617cf0a838b4447c4d02c72..764ccfa846dc4a106e656d79e3c49b541e1d0c9c 100644 (file)
--- a/src/psyc/psyc.conf.in
+++ b/src/psyc/psyc.conf.in
@@ -1,5 +1,5 @@
 [psyc]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-psyc
 
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock

diff --git a/src/psyc/test_psyc.conf b/src/psyc/test_psyc.conf
index 4e2563a8a2ccba42438b8d248526ca37ac6bd66e..8b2ab963917d2e0766bcfb3804a61b8bd2d00e4e 100644 (file)
--- a/src/psyc/test_psyc.conf
+++ b/src/psyc/test_psyc.conf
@@ -17,12 +17,12 @@ ENABLE_UPNP = NO
 
 [psyc]
 FORCESTART = YES
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [multicast]
 FORCESTART = YES
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [psycstore]
 FORCESTART = YES
-AUTOSTART = YES
+START_ON_DEMAND = YES

diff --git a/src/psycstore/psycstore.conf.in b/src/psycstore/psycstore.conf.in
index 82e9e67c2a1c68cb6d781620a6b2abd725b87332..3905db17372b47b2fdf03e60511b3ef93915234a 100644 (file)
--- a/src/psycstore/psycstore.conf.in
+++ b/src/psycstore/psycstore.conf.in
@@ -1,5 +1,5 @@
 [psycstore]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-psycstore
 
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock

diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index 7447322d4bb8868ca2b51f6db9317dd24703f503..4fd4d8b8a54c745a7ab3b8787cded68da4b3955d 100644 (file)
--- a/src/pt/test_gns_vpn.conf
+++ b/src/pt/test_gns_vpn.conf
@@ -28,15 +28,15 @@ DNS_EXIT = 8.8.8.8
 FORCESTART = YES
 
 [identity]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [zonemaster]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 
 #[vpn]
@@ -61,7 +61,7 @@ TCP_REDIRECTS = 80:localhost4:8080
 TTL = 3600000
 
 [gns]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 
 # Delays starting of GNS, as we need to first
@@ -69,7 +69,7 @@ ZONEKEY = $GNUNET_TEST_HOME/.zonekey
 FORCESTART = NO
 
 [namestore]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [nat]
 USE_LOCALADDR = YES

diff --git a/src/pt/test_gnunet_vpn.conf b/src/pt/test_gnunet_vpn.conf
index c22cd34096be394adf565e7e7523bea52a379b0c..dfe553784bdb3ffb46e23815f423148ad9d61cdf 100644 (file)
--- a/src/pt/test_gnunet_vpn.conf
+++ b/src/pt/test_gnunet_vpn.conf
@@ -21,7 +21,7 @@ IPV4MASK = 255.255.255.0
 EXIT_IFNAME = eth1
 
 [hostlist]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [nse]
@@ -38,11 +38,11 @@ IPV4MASK = 255.255.255.0
 
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [nat]
 USE_LOCALADDR = YES
 RETURN_LOCAL_ADDRESSES = YES
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in
index 8a75881f931c1249e7b7ff509bb3f0b04ff4955d..5e68a43da20bbd78963529c1648714842e078940 100644 (file)
--- a/src/regex/regex.conf.in
+++ b/src/regex/regex.conf.in
@@ -1,5 +1,5 @@
 [regex]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2107
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock
 HOSTNAME = localhost

diff --git a/src/regex/test_regex_api_data.conf b/src/regex/test_regex_api_data.conf
index 60dcdc0b63c61f97d8eac3fbdc0303a5da976a05..40fee1e54e00324a9a1a2e775b57b6a326287e32 100644 (file)
--- a/src/regex/test_regex_api_data.conf
+++ b/src/regex/test_regex_api_data.conf
@@ -19,11 +19,11 @@ WAN_QUOTA_IN = 1 GB
 WAN_QUOTA_OUT = 1 GB
 
 [dht]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 12370
 
 [regex]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 plugins = tcp

diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in
index 333f2e4883f8180a4606555f85ac8585bf3130c7..fe2318286a4805395cf31b4328eaa3b5021916be 100644 (file)
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -1,5 +1,5 @@
 [revocation]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 FORCESTART = YES
 @JAVAPORT@PORT = 2112
 HOSTNAME = localhost

diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in
index 733b726012e7209b1b54b4c9e751f9826551fe8c..7f0a419bd0130f52395418e1891c75fa71cd4565 100644 (file)
--- a/src/rps/rps.conf.in
+++ b/src/rps/rps.conf.in
@@ -1,5 +1,5 @@
 [rps]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-rps
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-rps.sock
 HOME = $SERVICEHOME

diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index e4ed111e2af191aba5f2eb8d90ec8c24e3bda0cf..3d856c693a0ee1fe7ac63b535349f54b994c7f38 100644 (file)
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -6,7 +6,7 @@ HOME = $SERVICEHOME
 # PORT = 2106
 #@UNIXONLY@ PORT = 2087
 FORCESTART = YES
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 #OPTIONS=-l /tmp/rps_profiler_logs/rps-[]-%Y-%m-%d.log
 
@@ -81,43 +81,43 @@ DISABLE_TRY_CONNECT = YES
 
 #[statistics]
 #FORCESTART = NO
-#AUTOSTART = NO
+#START_ON_DEMAND = NO
 
 [peerinfo]
 NO_IO = YES
 
 [hostlist]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [zonemaster]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namecache]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [namestore]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [topology]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [vpn]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [revocation]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [gns]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [fs]
 FORCESTART = NO
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/src/scalarproduct/scalarproduct.conf.in b/src/scalarproduct/scalarproduct.conf.in
index e2a0c7ad7dee033fd2419834bd6faef4a11c6320..e2286b076e46a8820f622ebcf6050bb5a3ae7849 100644 (file)
--- a/src/scalarproduct/scalarproduct.conf.in
+++ b/src/scalarproduct/scalarproduct.conf.in
@@ -1,5 +1,5 @@
 [scalarproduct-alice]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-scalarproduct-ecc-alice
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-alice.sock
 @UNIXONLY@ PORT = 2117
@@ -12,7 +12,7 @@ UNIX_MATCH_GID = YES
 
 
 [scalarproduct-bob]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 HOSTNAME = localhost
 BINARY = gnunet-service-scalarproduct-ecc-bob
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-scalarproduct-bob.sock

diff --git a/src/secretsharing/secretsharing.conf.in b/src/secretsharing/secretsharing.conf.in
index 0834235d47d9b5053cc7f507b9b6b1450aae4cd1..bd8da6177f6bd60af405e646f7e55335f03a0bb6 100644 (file)
--- a/src/secretsharing/secretsharing.conf.in
+++ b/src/secretsharing/secretsharing.conf.in
@@ -1,5 +1,5 @@
 [secretsharing]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @JAVAPORT@PORT = 2114
 HOSTNAME = localhost
 BINARY = gnunet-service-secretsharing

diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index 9980666cd750a562463e8a0ffbde9a57543e1d5d..3391c88dbd3c991e49e1d7e954d96895f36e6f11 100644 (file)
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -1,10 +1,10 @@
 [secretsharing]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full
 OPTIONS = -LINFO
 
 [consensus]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [transport]
 OPTIONS = -LERROR
@@ -12,7 +12,7 @@ PLUGINS = unix
 
 [set]
 OPTIONS = -L INFO
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full
 
 [testbed]
@@ -32,5 +32,5 @@ DISABLEV6 = NO
 RETURN_LOCAL_ADDRESSES = YES
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 

diff --git a/src/set/set.conf.in b/src/set/set.conf.in
index deaa07efb76d7eaf5d7119b023e650e206480b12..66bcfa1693394ea5c15b37914dd74fe42738ecb3 100644 (file)
--- a/src/set/set.conf.in
+++ b/src/set/set.conf.in
@@ -1,5 +1,5 @@
 [set]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@PORT = 2106
 HOSTNAME = localhost
 BINARY = gnunet-service-set

diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 02afd2ec55be4cd4f281f391bfc673c3f69bd9b9..21fe984f8378e8bd6f4e9a2f698bd02ca9c27eab 100644 (file)
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -4,7 +4,7 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-set/
 
 [set]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 #PREFIX = valgrind --leak-check=full
 #PREFIX = gdbserver :1234
 OPTIONS = -L INFO

diff --git a/src/social/social.conf.in b/src/social/social.conf.in
index 7dfa140e645d287f87ae5a9aed1a882d8097d950..3fe754c80a29a6051b0e1dcfedebc982de4229a6 100644 (file)
--- a/src/social/social.conf.in
+++ b/src/social/social.conf.in
@@ -1,5 +1,5 @@
 [social]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 BINARY = gnunet-service-social
 RUN_PER_USER = YES
 

diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in
index 2d001137246a5d99000746aae068c0752ade8ce2..36aca538fc64cf318e5bafa00b1087670c621735 100644 (file)
--- a/src/statistics/statistics.conf.in
+++ b/src/statistics/statistics.conf.in
@@ -1,5 +1,5 @@
 [statistics]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2088
 HOSTNAME = localhost
 BINARY = gnunet-service-statistics

diff --git a/src/template/template.conf b/src/template/template.conf
index 8c8c179f708217d9236e519ec9f4ced47bf6284f..e5f675a5d0eb3619a5beb11aaa7d127472977987 100644 (file)
--- a/src/template/template.conf
+++ b/src/template/template.conf
@@ -1,5 +1,5 @@
 [template]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 9999
 HOSTNAME = localhost
 BINARY = gnunet-service-template

diff --git a/src/testbed-logger/testbed-logger.conf.in b/src/testbed-logger/testbed-logger.conf.in
index 05ef782ae29ff90718e27da8cdc1982b409535e6..288bbed72d6b16eeab98a1a3da2de773c67ceecf 100644 (file)
--- a/src/testbed-logger/testbed-logger.conf.in
+++ b/src/testbed-logger/testbed-logger.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed
@@ -90,7 +90,7 @@ SHARED_SERVICES =
 
 
 [testbed-logger]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @UNIXONLY@ PORT = 2102
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed-logger
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES
 
 
 [testbed-barrier]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @UNIXONLY@ PORT = 2103
 HOSTNAME = localhost
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
@@ -112,7 +112,7 @@ UNIX_MATCH_GID = YES
 # This section is related to configuring underlay restrictions to simulate
 # connectivity restrictions of NAT boxes
 [testbed-underlay]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-testbed-underlay
 # The sqlite3 database file containing information about what underlay
@@ -120,8 +120,8 @@ BINARY = gnunet-daemon-testbed-underlay
 # DBFILE =
 
 [latency-logger]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-latency-logger
 # The sqlite3 database file where the latency values are to be stored
-# DBFILE =
\ No newline at end of file
+# DBFILE =

diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 8cad6df098a916abce7712fe3c54ea7ad81e5f6c..846b894c7ab8cd3b4b5a8fe802ef6187bb985a94 100644 (file)
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -10,25 +10,25 @@ TOPOLOGY = RANDOM
 PORT = 12366
 
 [test-barriers]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12114
 BINARY = /will/be/overwriten/in/test_testbed_api_barriers/
 FORCESTART = YES
 
 [fs]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [resolver]
 HOSTNAME = localhost
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [cadet]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [dht]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [dhtcache]
@@ -49,7 +49,7 @@ WAN_QUOTA_IN = 3932160
 
 [core]
 PORT = 12092
-AUTOSTART = YES
+START_ON_DEMAND = YES
 FORCESTART = YES
 USE_EPHEMERAL_KEYS = NO
 
@@ -61,15 +61,15 @@ PORT = 12368
 GNUNET_TEST_HOME = $GNUNET_TMP/test-testbed/
 
 [dns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [nse]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [vpn]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [nat]
@@ -77,27 +77,27 @@ RETURN_LOCAL_ADDRESSES = YES
 FORCESTART = NO
 
 [gns-helper-service-w32]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 
 [consensus]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [gns]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [statistics]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [peerinfo]
 NO_IO = YES
 
 [set]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 FORCESTART = NO
 
 [revocation]
-AUTOSTART = NO
-FORCESTART = NO
\ No newline at end of file
+START_ON_DEMAND = NO
+FORCESTART = NO

diff --git a/src/testbed/test_testbed_api_statistics.conf b/src/testbed/test_testbed_api_statistics.conf
index 65366835dab8e97c495c042fdf9391319657aa98..50d3f2c0440daf1a1024d8cda8a3ede294627474 100644 (file)
--- a/src/testbed/test_testbed_api_statistics.conf
+++ b/src/testbed/test_testbed_api_statistics.conf
@@ -5,5 +5,5 @@ OVERLAY_TOPOLOGY = 2D_TORUS
 MAX_PARALLEL_SERVICE_CONNECTIONS = 2
 
 [statistics]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 PORT = 30

diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index 04982984200009536cea79dd48778f3d29be3383..d893ba1435d5b155302cc08a866b1e26f325de8d 100644 (file)
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -2,7 +2,7 @@
 @INLINE@ ../../contrib/conf/gnunet/no_autostart_above_core.conf
 
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost
@@ -22,7 +22,7 @@ FORCESTART = YES
 
 # Transport requires resolver when connecting to a peer, so enable it
 [resolver]
-AUTOSTART = YES
+START_ON_DEMAND = YES
 
 [ats]
 WAN_QUOTA_OUT = 3932160

diff --git a/src/testbed/test_testbed_underlay.conf.in b/src/testbed/test_testbed_underlay.conf.in
index 5799b52533c7080115d46ac74a7379f6988d33f9..b46716cdeb058f3506ebb42c1db657e35002f46b 100644 (file)
--- a/src/testbed/test_testbed_underlay.conf.in
+++ b/src/testbed/test_testbed_underlay.conf.in
@@ -5,9 +5,9 @@ OVERLAY_TOPOLOGY = LINE
 OPERATION_TIMEOUT = 5 s
 
 [testbed-underlay]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 DBFILE = /will/be/overwritten/by/testcase
 FORCESTART = YES
 
 [dv]
-AUTOSTART = NO
+START_ON_DEMAND = NO

diff --git a/src/testbed/testbed.conf.in b/src/testbed/testbed.conf.in
index 86044fbfb5ba41886e3d836acf4c581924768242..c1d64b3240267308891b7ff6a6ecc29be24e9f32 100644 (file)
--- a/src/testbed/testbed.conf.in
+++ b/src/testbed/testbed.conf.in
@@ -1,5 +1,5 @@
 [testbed]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @JAVAPORT@ PORT = 2101
 HOSTNAME = localhost
 BINARY = gnunet-service-testbed
@@ -90,7 +90,7 @@ SHARED_SERVICES =
 
 
 [testbed-barrier]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 @UNIXONLY@ PORT = 2103
 HOSTNAME = localhost
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-testbed-barrier.sock
@@ -101,7 +101,7 @@ UNIX_MATCH_GID = YES
 # This section is related to configuring underlay restrictions to simulate
 # connectivity restrictions of NAT boxes
 [testbed-underlay]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-testbed-underlay
 # The sqlite3 database file containing information about what underlay
@@ -109,8 +109,8 @@ BINARY = gnunet-daemon-testbed-underlay
 # DBFILE =
 
 [latency-logger]
-AUTOSTART = NO
+START_ON_DEMAND = NO
 NOARMBIND = YES
 BINARY = gnunet-daemon-latency-logger
 # The sqlite3 database file where the latency values are to be stored
-# DBFILE =
\ No newline at end of file
+# DBFILE =

diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index 1f56a2fa75cbdb0a1b7ca607d4d4ab977c19fc2f..4185acc291f332fc2483c7754cf1918ef2c9f123 100644 (file)
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -1,5 +1,5 @@
 [transport]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2091
 HOSTNAME = localhost
 BINARY = gnunet-service-transport

diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in
index 9c5df32bc2cfd711d344e6d84dccd6e2a7157dc1..6e2b9a869dfd643352a1526eb41117dd00889f33 100644 (file)
--- a/src/util/resolver.conf.in
+++ b/src/util/resolver.conf.in
@@ -1,5 +1,5 @@
 [resolver]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @JAVAPORT@PORT = 2089
 HOSTNAME = localhost
 BINARY = gnunet-service-resolver

diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index 58513155463c2a4badba5b90b9647afc355f83ab..c0f4c59ed0472f64a27ebb22e108f09ea35b5c62 100644 (file)
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -1,5 +1,5 @@
 [vpn]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 @UNIXONLY@ PORT = 2105
 HOSTNAME = localhost
 BINARY = gnunet-service-vpn

diff --git a/src/zonemaster/zonemaster.conf.in b/src/zonemaster/zonemaster.conf.in
index 6179b87be2b9cdba593a4a1959ddf00a59749293..057e43f2925c434da8bac6a1813a10734daf007a 100644 (file)
--- a/src/zonemaster/zonemaster.conf.in
+++ b/src/zonemaster/zonemaster.conf.in
@@ -1,5 +1,5 @@
 [zonemaster]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 FORCESTART = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-zonemaster
@@ -27,7 +27,7 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
 
 
 [zonemaster-monitor]
-AUTOSTART = @AUTOSTART@
+START_ON_DEMAND = @START_ON_DEMAND@
 FORCESTART = YES
 HOSTNAME = localhost
 BINARY = gnunet-service-zonemaster-monitor