Merge branch 'master' of ssh://gnunet.org/gnunet

2 files changed, 10 insertions, 10 deletions

diff --git a/src/pt/test_gns_vpn.conf b/src/pt/test_gns_vpn.conf
index c603b7422..4fd4d8b8a 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
@@ -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 c22cd3409..dfe553784 100644
--- 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