remove meson.options
The only option in this repository is configuring the location
of the persistent file location. This is not ever leveraged
by anyone. Reduce the complexity of maintaining a meson.option
to hold a string and just move it to a constant in a header.
Change-Id: I066d88d2831d1d04fd53b47e26cd6fbcabf863d2
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/src/main.cpp b/src/main.cpp
index 6e2a963..8c2d78b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,6 +14,7 @@
// limitations under the License.
*/
+#include "config.hpp"
#include "manager.hpp"
#include "password.hpp"
@@ -38,7 +39,7 @@
* Object path : /xyz/openbmc_project/bios_config/manager
* Interface : xyz.openbmc_project.BIOSConfig.Manager
*/
- bios_config::Manager manager(objectServer, systemBus);
+ bios_config::Manager manager(objectServer, systemBus, BIOS_PERSIST_PATH);
/**
* Password class is responsible for handling methods and signals under
diff --git a/src/manager.cpp b/src/manager.cpp
index 3cb96f5..5d771ea 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -311,12 +311,13 @@
}
Manager::Manager(sdbusplus::asio::object_server& objectServer,
- std::shared_ptr<sdbusplus::asio::connection>& systemBus) :
+ std::shared_ptr<sdbusplus::asio::connection>& systemBus,
+ std::string persistPath) :
sdbusplus::xyz::openbmc_project::BIOSConfig::server::Manager(
*systemBus, objectPath),
objServer(objectServer), systemBus(systemBus)
{
- fs::path biosDir(BIOS_PERSIST_PATH);
+ fs::path biosDir(persistPath);
fs::create_directories(biosDir);
biosFile = biosDir / biosPersistFile;
deserialize(biosFile, *this);
diff --git a/src/password.cpp b/src/password.cpp
index c5d9d6e..03aeb79 100644
--- a/src/password.cpp
+++ b/src/password.cpp
@@ -15,6 +15,7 @@
*/
#include "password.hpp"
+#include "config.hpp"
#include "xyz/openbmc_project/BIOSConfig/Common/error.hpp"
#include "xyz/openbmc_project/Common/error.hpp"