Add support for $GNUNET_BASE_CONFIG

The environment variable GNUNET_BASE_CONFIG allows
specifying the directory from which all base config
files will be loaded.  This is useful when ARM is
to be used to supervise things otherwise unrelated to
GNUnet.  Modifying GNUNET_PREFIX is not sufficient
for this use case, since e.g. libexec files need
to be under GNUNET_PREFIX, and GNUNET_BASE_CONFIG
provides a way to only modify the base config
directory independent of where GNUnet was installed.

1 files changed, 15 insertions, 8 deletions

diff --git a/src/util/configuration_loader.c b/src/util/configuration_loader.c
index 37cf1a75d..2caad8c05 100644
--- a/src/util/configuration_loader.c
+++ b/src/util/configuration_loader.c
@@ -29,7 +29,7 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
 
-#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
 /**
  * Load configuration (starts with defaults, then loads
  * system-specific configuration).
@@ -43,14 +43,21 @@ GNUNET_CONFIGURATION_load (struct GNUNET_CONFIGURATION_Handle *cfg,
                            const char *filename)
 {
   char *baseconfig;
-  char *ipath;
 
-  ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  if (NULL == ipath)
-    return GNUNET_SYSERR;
-  baseconfig = NULL;
-  GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
-  GNUNET_free (ipath);
+  if (NULL != (baseconfig = getenv ("GNUNET_BASE_CONFIG")))
+  {
+    baseconfig = GNUNET_strdup (baseconfig);
+  }
+  else
+  {
+    char *ipath;
+
+    ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR);
+    if (NULL == ipath)
+      return GNUNET_SYSERR;
+    GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
+    GNUNET_free (ipath);
+  }
 
   if (GNUNET_SYSERR ==
       GNUNET_CONFIGURATION_load_from (cfg,