From b8fc68d6cb81adb3803186359b3a30b1a4bb7b5a Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 10 Dec 2014 17:11:06 +0000
Subject: moving away from DEFAULTSERVICES to per-section FORCESTART, thus
 addressing #3565 indirectly

---
 src/fs/fs.conf.in            | 2 ++
 src/fs/test_fs_defaults.conf | 1 -
 src/fs/test_fs_uri_data.conf | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/fs')

diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index dcd121587..ca0191e36 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,5 +1,6 @@
 [fs]
 AUTOSTART = @AUTOSTART@
+FORCESTART = YES
 INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
 RESPECT = $GNUNET_DATA_HOME/fs/credit/
 STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
@@ -60,6 +61,7 @@ MAX_CADET_CLIENTS = 128
 
 [gnunet-auto-share]
 BINARY = gnunet-auto-share
+FORCESTART = NO
 
 # Note: MUST specify path to auto-share directory and CAN specify other options
 # to gnunet-auto-share here!
diff --git a/src/fs/test_fs_defaults.conf b/src/fs/test_fs_defaults.conf
index b57e51ed0..97d8e6f87 100644
--- a/src/fs/test_fs_defaults.conf
+++ b/src/fs/test_fs_defaults.conf
@@ -22,7 +22,6 @@ RETURN_LOCAL_ADDRESSES = YES
 [arm]
 PORT = 4366
 HOSTNAME = localhost
-DEFAULTSERVICES = fs
 
 [datastore]
 QUOTA = 100 MB
diff --git a/src/fs/test_fs_uri_data.conf b/src/fs/test_fs_uri_data.conf
index 5355fbc85..fcf6f42d4 100644
--- a/src/fs/test_fs_uri_data.conf
+++ b/src/fs/test_fs_uri_data.conf
@@ -2,6 +2,4 @@
 [PATHS]
 GNUNET_TEST_HOME = /tmp/gnunet-test-fs-uri/
 
-[arm]
-DEFAULTSERVICES = topology hostlist
 
-- 
cgit v1.2.3