From e5daa4634f5fb7e22ed07c882e224b65c3d78ada Mon Sep 17 00:00:00 2001 From: "psyc://loupsycedyglgamf.onion/~lynX" Date: Sat, 23 Jun 2018 13:30:02 +0000 Subject: rename USER/SYSTEM_ONLY into START_USER/SYSTEM_SERVICES (#4548) --- src/arm/arm.conf.in | 6 +++--- src/arm/gnunet-service-arm.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/arm') 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@ # system-level services (and we'll expect a second ARM to be # run per-user to run user-level services). Note that in this # case you must have manually created a different configuration -# file with the user where at least this and the USER_ONLY +# file with the user where at least this and the START_USER_SERVICES # options differ. -# SYSTEM_ONLY = YES +# START_SYSTEM_SERVICES = YES # If set to YES, ARM will only start services that are marked as # per-user services (and we'll expect a system user to run ARM to @@ -39,7 +39,7 @@ GLOBAL_PREFIX = @MONKEYPREFIX@ # USER ARM instances to some free port (counting down from 2085 should # be sane). # -# USER_ONLY = YES +# START_USER_SERVICES = YES # File where we should log per-service resource consumption on exit. # 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, final_option); start_user = GNUNET_CONFIGURATION_get_value_yesno (cfg, "ARM", - "USER_ONLY"); + "START_USER_SERVICES"); start_system = GNUNET_CONFIGURATION_get_value_yesno (cfg, "ARM", - "SYSTEM_ONLY"); + "START_SYSTEM_SERVICES"); if ( (GNUNET_NO == start_user) && (GNUNET_NO == start_system) ) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Please configure either USER_ONLY or SYSTEM_ONLY or both.\n"); + "Please configure either START_USER_SERVICES or START_SYSTEM_SERVICES or both.\n"); GNUNET_SCHEDULER_shutdown (); global_ret = 1; return; -- cgit v1.2.3