diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/arm/arm.conf.in | 6 | ||||
-rw-r--r-- | src/arm/gnunet-service-arm.c | 6 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.conf | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in index 38cf4599c..64ae35786 100644 --- a/src/arm/arm.conf.in +++ b/src/arm/arm.conf.in | |||
@@ -22,9 +22,9 @@ GLOBAL_PREFIX = @MONKEYPREFIX@ | |||
22 | # system-level services (and we'll expect a second ARM to be | 22 | # system-level services (and we'll expect a second ARM to be |
23 | # run per-user to run user-level services). Note that in this | 23 | # run per-user to run user-level services). Note that in this |
24 | # case you must have manually created a different configuration | 24 | # case you must have manually created a different configuration |
25 | # file with the user where at least this and the USER_ONLY | 25 | # file with the user where at least this and the START_USER_SERVICES |
26 | # options differ. | 26 | # options differ. |
27 | # SYSTEM_ONLY = YES | 27 | # START_SYSTEM_SERVICES = YES |
28 | 28 | ||
29 | # If set to YES, ARM will only start services that are marked as | 29 | # If set to YES, ARM will only start services that are marked as |
30 | # per-user services (and we'll expect a system user to run ARM to | 30 | # per-user services (and we'll expect a system user to run ARM to |
@@ -39,7 +39,7 @@ GLOBAL_PREFIX = @MONKEYPREFIX@ | |||
39 | # USER ARM instances to some free port (counting down from 2085 should | 39 | # USER ARM instances to some free port (counting down from 2085 should |
40 | # be sane). | 40 | # be sane). |
41 | # | 41 | # |
42 | # USER_ONLY = YES | 42 | # START_USER_SERVICES = YES |
43 | 43 | ||
44 | # File where we should log per-service resource consumption on exit. | 44 | # File where we should log per-service resource consumption on exit. |
45 | # RESOURCE_DIAGNOSTICS = resource.log | 45 | # RESOURCE_DIAGNOSTICS = resource.log |
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index 4f443d0a1..22c967a9f 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -2226,15 +2226,15 @@ run (void *cls, | |||
2226 | final_option); | 2226 | final_option); |
2227 | start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg, | 2227 | start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg, |
2228 | "ARM", | 2228 | "ARM", |
2229 | "USER_ONLY"); | 2229 | "START_USER_SERVICES"); |
2230 | start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg, | 2230 | start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg, |
2231 | "ARM", | 2231 | "ARM", |
2232 | "SYSTEM_ONLY"); | 2232 | "START_SYSTEM_SERVICES"); |
2233 | if ( (GNUNET_NO == start_user) && | 2233 | if ( (GNUNET_NO == start_user) && |
2234 | (GNUNET_NO == start_system) ) | 2234 | (GNUNET_NO == start_system) ) |
2235 | { | 2235 | { |
2236 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2236 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2237 | "Please configure either USER_ONLY or SYSTEM_ONLY or both.\n"); | 2237 | "Please configure either START_USER_SERVICES or START_SYSTEM_SERVICES or both.\n"); |
2238 | GNUNET_SCHEDULER_shutdown (); | 2238 | GNUNET_SCHEDULER_shutdown (); |
2239 | global_ret = 1; | 2239 | global_ret = 1; |
2240 | return; | 2240 | return; |
diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf index c603b7422..7447322d4 100644 --- a/src/pt/test_gns_vpn.conf +++ b/src/pt/test_gns_vpn.conf | |||
@@ -7,8 +7,8 @@ PLUGINS = tcp | |||
7 | [arm] | 7 | [arm] |
8 | PORT = 0 | 8 | PORT = 0 |
9 | ALLOW_SHUTDOWN = YES | 9 | ALLOW_SHUTDOWN = YES |
10 | SYSTEM_ONLY = NO | 10 | START_SYSTEM_SERVICES = NO |
11 | USER_ONLY = NO | 11 | START_USER_SERVICES = NO |
12 | 12 | ||
13 | [exit] | 13 | [exit] |
14 | FORCESTART = YES | 14 | FORCESTART = YES |