rename USER/SYSTEM_ONLY into START_USER/SYSTEM_SERVICES (#4548)

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@
 # 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;
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
 [arm]
 PORT = 0
 ALLOW_SHUTDOWN = YES
-SYSTEM_ONLY = NO
-USER_ONLY = NO
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = NO
 
 [exit]
 FORCESTART = YES