aboutsummaryrefslogtreecommitdiff
path: root/src/arm
diff options
context:
space:
mode:
authorpsyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet>2018-06-23 13:30:02 +0000
committerpsyc://loupsycedyglgamf.onion/~lynX <ircs://psyced.org/youbroketheinternet>2018-06-23 13:30:02 +0000
commite5daa4634f5fb7e22ed07c882e224b65c3d78ada (patch)
tree4f154fe09791a9103a515b1ab9671f1e08484d47 /src/arm
parent92609e8b088bf1dde6b927dc0e3be2e9092f0f87 (diff)
downloadgnunet-e5daa4634f5fb7e22ed07c882e224b65c3d78ada.tar.gz
gnunet-e5daa4634f5fb7e22ed07c882e224b65c3d78ada.zip
rename USER/SYSTEM_ONLY into START_USER/SYSTEM_SERVICES (#4548)
Diffstat (limited to 'src/arm')
-rw-r--r--src/arm/arm.conf.in6
-rw-r--r--src/arm/gnunet-service-arm.c6
2 files changed, 6 insertions, 6 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;