Merge pull request #8 from AndreasAakesson/master

Support new config structure

Author: AndreasAakesson

register_plugin.cpp

@@ -17,8 +17,6 @@
 
 #include "ws_uplink.hpp"
 #include "common.hpp"
-
-#include <net/autoconf.hpp>
 #include <os>
 
 namespace uplink {
@@ -37,8 +35,6 @@ void setup_uplink()
   MYINFO("Setting up WS uplink");
 
   try {
-    net::autoconf::load();
-
     auto& en0 = net::Super_stack::get<net::IP4>(0);
 
     uplink = std::make_unique<WS_uplink>(en0);

starbase/CMakeLists.txt

@@ -10,7 +10,7 @@ include($ENV{INCLUDEOS_PREFIX}/includeos/pre.service.cmake)
 
 
 # Name of your project
-project (seed)
+project (starbase)
 
 # Human-readable name of your service
 set(SERVICE_NAME "IncludeOS Starbase")
@@ -39,16 +39,13 @@ set(SOURCES
 # DRIVERS / PLUGINS:
 
 set(DRIVERS
-  virtionet   # Virtio networking
+  virtionet
   vmxnet3
-  # virtioblock # Virtio block device
-  # ... Others from IncludeOS/src/drivers
   )
 
 set(PLUGINS
-  # syslogd    # Syslog over UDP
-  # ...others
   uplink
+  autoconf
   )
 
 # THIRD PARTY LIBRARIES:

starbase/disk/config.json starbase/config.jsonstarbase/disk/config.json renamed to starbase/config.json

@@ -18,8 +18,6 @@
 #include "ws_uplink.hpp"
 #include "common.hpp"
 
-#include <memdisk>
-
 #ifndef RAPIDJSON_HAS_STDSTRING
   #define RAPIDJSON_HAS_STDSTRING 1
 #endif
@@ -37,6 +35,7 @@
 #include <hw/pci_device.hpp>
 #include <kernel/cpuid.hpp>
 #include <statman>
+#include <config>
 
 namespace uplink {
 
@@ -264,24 +263,13 @@ namespace uplink {
 
   void WS_uplink::read_config()
   {
-    MYINFO("Reading uplink config from %s", UPLINK_CFG_FILE.c_str());
-    auto& disk = fs::memdisk();
-
-    if (not disk.fs_ready())
-    {
-      disk.init_fs([] (auto err, auto&) {
-        Expects(not err && "Error occured when mounting FS.");
-      });
-    }
-
-    auto cfg = disk.fs().stat(UPLINK_CFG_FILE); // name hardcoded for now
+    MYINFO("Reading uplink config");
 
-    Expects(cfg.is_file() && "File not found.");
-    Expects(cfg.size() && "File is empty.");
+    const auto& cfg = ::Config::get();
 
-    auto content = cfg.read();
+    Expects(not cfg.empty() && "Config is empty");
 
-    parse_config(content);
+    parse_config({cfg.data(), cfg.size()});
   }
 
   void WS_uplink::parse_config(const std::string& json)